Fixes in Intellidemand