Add corrections from HLint