Fix errors from merge