Fix errors introduice during merge