Some adjustements to cursors