some hlint fixes