Fix some quality issues for components module