*fix numerous regressions that I let slip: