TorqueBox fixes for new token-app version