Update for deprecated amazonproduct API.
More fixes.