Couple of minor additions