Fix a few misc errors