fixed compile errors maybe