Fix a silly typo, and other minor cleanup
Merge branch 'for-upstream/leptdeskew' into develop