Adapt to product_dir change