Fixes for ZEN-12386