Make the version regular expressions more resiliant