a couple of tiny improvements