Minor fixes, new full loader.