Fixed a few issues with the new WooCommerce Version