Fix build issues introduced in last commit
Merge pull request #1649 from tschneidereit/master

Fix build issues introduced in last commit