Fix some glitches that broke things.