Typo fix
Fix for #1237, uninitialized moveCount
Merge PRs #1239 and #1230 - trivial fixes