some more minor fixes