Fix #1449: fix lint and typos
5 files changed