Small fixes to the master branch to compile out of the box again.