More tweaks to SMS recipient check