General improvements in loader.