Fix compile errors from merge