Fixes in components