Fix a few basic things