Temporary fix for PlotCanvas (no cached canvas) and PlotDrag (need to sort out modifiers)
Both to be revisited