Cleanup of paths some more, hopefully it works better with absolute paths.