Buildfix

Okay, because I had to commit last time with build errors, I had to fix
them again in a separate commit ;(