Fixing up paths