Changes for paths with spaces