Minor tweaks, before changing flashassets