Further tweaks to optimise file versioning