Minor changes to control loaded components

Minor changes to all better control over loaded components.