More tab/space fixes