SM-13386 Misc fixes