[PPP-3244] - VersionCheck fixes