All these things I've fixed

Just one round of Jono's compile issues