Tabs to spaces and compiler compatibility fixes