Fix update product delivery and bill