Fix final merge errors