Fixed new version match and a few things