Tax fixes with discounts