Fixing compile errors/bugs/warnings related to overhaul

(not touching actual world code yet)