Fixes for xen-gnt