Add patch to use correct cursor and some info.