SM-13565 Misc fixes