Fixes for incoming SMS