Shush: bug fixes

bug fixes