Fixes for SMS suite