Fixes for SMS and emailing