Couple of minor changes (1 minor bug).