Windows: disable and enable tap to allow changes to take effect.
Build fixes for *nix