Improved cursor handling?