Fix two issues found by static analysis
Fix a few random typos
Merge pull request #1143 from HairyFotr/patch-sca

Fix two issues found by static analysis
Merge pull request #1144 from HairyFotr/patch-typo

Fix a few random typos