Fixed various other compile errors