Yet more minor fixes