Fixed intellidemand build bugs