Fix typos and linting errors