Some path fixes