Fixed more compile errors