More fixes to build-process