more tweaks to cursor preservation