fix all remaining compile errors