Fixed an org issue and fixed paths with spaces.