Fix some glitches