Fix a couple history bugs.  Rotation, and alwasy on.
Merge branch 'history-bugs'

* history-bugs:
  Fix a couple history bugs.  Rotation, and alwasy on.