Fixed a number of compilation issues, least of which was copy and paste code that required updating