fixed compile errors after merge