Ss fixes

These were caught by bugs down the line. Just problems introduced by the refactoring into separate modules.