Tabs and linear map tweaks