Fix some additional Windows/Unix file handling issues