Added more support for windows directories.