More fixes to build type