And another couple of small fixes