Minor changes to several components