[SHRINKRES-112] More edits to limit API changes