A few tweaks to the build setup & reported version