Fix issues with navigating non-root directories