STORE-276	Deactivate Component Adjustment

And various fixes