Fixed problems with path separators and spaces