Changes to allow filesystem_test to pass on Windows.