Added fixes by HLint