Fixup and some changes needed to support win + lin