Fixed other compile errors