Changes to help debug issues like OMS-226