Added path fixes