Fix tax calculations