Fixes for ZEN-9842 and ZEN-9839