Fixes for products/images