Local path fixes