Suggested HLint changes