Updates to match latest version of jso