Results 2 issues of Emil Mikulic

A recent "apt-get upgrade" broke hellanzb for me. These two commits fix it. Please merge them. :)