Some path fixes.