Further path fixes