Fixes for ZEN-10086, ZEN-10939