Fix hlint issues