bulk fixes to build