Fix other version-specific calls