Fix a few more problems