Typo and lint fixes

Ping @utahdave.