Make a few minor changes as suggested by HLint