Fix a few more minor issues