Fix up paths