Couple of tweaks to loading behaviour