Couple of minor fixes.