Minor component improvements