More fixes for product template