Clutch clunk and gear indicator number missing!!!

Dear Citigo members, I am having a bit of a problem with my four year old Citigo which has now done 42,000 miles. The problem seems to be quite common on the Citigo - there is an annoying clunk on the up stroke of the clutch when I change gear. This has continued now for nearly a week, but today I noticed that the gear indicator number on the dashboard has completely disappeared!! I plan a visit to the local dealer next week as the car is under warranty, but will they try to fob me off, or is it covered under the warranty? Your advice will determine the way I handle this. Thanks very much, Mark.