A couple of small fixes all around