Fix issues with component