Plus and product bugs fixed