Fix the path handling stuff.