fixes to support Twilio better