Minor bug fixes (drawing glitches)