More Fixes for ZEN-14593