Bug fixes with components