Fixed compile errors from merge