Couple of minor bugfixes.