a bit of minor fixes