fixed compile errors from merge