Build fixes

Signed-off-by: Vinzenz Feenstra <evilissimo@gmail.com>
Merge pull request #92 from vinzenz/build-fixes

Build fix