Small fixes to get basic-test running on Windows 8.