Fix HLint errors