More fixes to enable building in the development repository