Avoid long chains of &&s
fix typo
Merge branch 'ogham-patch-1'