a few more minor fixes