A couple of small fixes