Fix a few hlint warnings