fixed more compile errors