Fix typo and other errors