Minor changements for cursor's events