Shoring up some other things