Quick fixes to building

There were some inexplicable glitches preventing building, now fixed