Remove tabs and correct minor build errors