Fix a couple of bugs reported by Roger.
3 files changed