Fix a few for pull request #80