Couple of minor changes