More twilio fixes