Very minor changes on cursor