More cursor clean ups.