Fix components