Couple of small fixes