a couple more minor fixes