another batch of small fixes