Various improvements to Urban Airship add-on