Some more rock support
Bugfix in cursor