Fix a few things