Further tweaks to build version numbers etc