Fix up some missing merges from Linux merge