Fix remaining compile errors