Shoring up more endpoints