Fix a few glitches