Final path fixes