Incoming sms fixes