Fixes in ComponentManger and Id handling for components