Fix various woocommerce issues