Fix issues with intents.