Tabs and spaces fixes