Tweaks to loader and exmaple.