Couple of minor stuff