and fix the last compile errors