Refine Juno linking a bit more.