Enable Intellidemand and some fixes