2.73: more minor fixes