Fix hlint warnings