Fix some HLint's warnings