SMS processing fixes