More fixes to make the master branch compile again