Some eCommerce fixes