Corrected more compile errors