Small fixes to several components