even more minor fixes