[FIX] Fixing various compilation bugs.
Merge pull request #646 from holtgrewe/feature/fix-builds

[FIX] Fixing various compilation bugs.