Fixing up drawing tools