Few more minor tweaks for products on SII