Minor fixes and default to first tax rate