Some path fixes for the standalone lookup.