fix some issues product