a couple of minor fixes