Fix #87 and #34 - fix issues with the caret redrawing when changing systems.