Assorted build glitches