Fixed leftovers from recent merge

Also fixed usage of gdk_window_get_device_position