A few more bug fixes from upstream. Also stop using system membarriers, and revert a recent xen migration fix (not the right one).