Fixes in SMS