Re-fix paths