Fix Intellidemand compilation errors