Fix a few bugs!