Fixed small glitches