Misc spec fixes for windows.