shared component bugfixes