clean up remaining compile errors