Fix a few nits