Another set of minor bug fixes