Last few path fixes