Fixed some small glitches