Sync some trivial changes from kernel-xen