windows fixes
Merge remote-tracking branch 'mach/coupling' into coupling