Better handling of build number