Fixed build errors
Merge pull request #2632 from WouterJ/fix_build_errors

Fixed build errors