fix regressions

hold off merging this until we discuss it in January