Another set of minor clean ups and fixes. #186