Better handling of version numbers