Fixes to taxes component