Fixes for  ZEN-11416, ZEN-10251