Fixed yet more compile errors