Changes to eliminate errors in new version of SDK tools.