fix some intents and demos