fixing remaining compile errors