Fixed issues for packages or directories with spaces in them