Fix drawing tool after recent merge errors