Small fixes for the drawing mode.