Fix after-merge issues