[JRO] Further tightening up setup scripts