Work a bit more on compile errors...

Signed-off-by: Constantin Runge <uroc327@cssbook.de>