Fix final merge errors - (2)