Update with a few tweaks for Tokbox