[JRO] More setup fixes