fixes for Amazon and use of versioncmp