More fixes to builder