More tweaks to the asset loader