Fix hlint warnings/errors

Signed-off-by: Ricky Elrod <ricky@elrod.me>
Merge branch 'relrod-hlint'