Fixes for ZEN-12571