Fix up some mis-merges from Linux merge