More hlint fixes