Fix build and tabs.