Couple of small fixes.