Fix up some paths