Silence a few warnings
Add undo move option