Fix some hlint issues