A few path fixes.