Some new version fixes