Fix lots of trivial compile blockers