Fixes after testing with ver strings from http://semver.org