Couple of minor fixes