Fix product create and update