Fixing drawing mode bugs