Fix import problems during Win install/packaging