Add corrections from HLint and -Wall, -Werror