[wallace] more shoring up scnearios