Added more DIRECTORY_SEPARATORs