Tweaks and improvements to various components