Additional path fixes