Fix merge issues after latest OK merge