Fix components

Fix components