Tax Type Fixes