Added path fixes.