minor bugs so that the Windows build works.