More touchups for Juniper before we swap branches