Multiple changes relating to DrawingTools