a couple of small fixes