Edit Product, minor fixes