Updates to comply with WooCommerce 2.1