Fix a few minor issues