Fix typo
More fixes