Product delete fixes