Heavyweight changes for the Windows build, might break