Quick fixes for new tax handlers.