Fix a few tiny things