Fixes for components