Issue #86: fixes to ensure we have the windows bundle (+ dlls) right