Fix Intellidemand compilation errors

More Intellidemand fixes