Fix a few minor issues in my previous changes.