Fixed some glitches.