more minor fixes