Windows path fixes; various performance improvements