146.x broke more than I thot

have a few lingering fixes from 146 shifting