Updating to latest jovr changes