Couple of minor bug fixes