prefix + variable cleanup
Fix prefix path