Changes to address merge issues