Fix ConcurrentModificationException while drawing cursor + cleanup
Fix cursor style in selection