Cover Behind Steering Wheel And Glove Compt.

Hi
I having 2 annoying problems on my 2000 C70. First is my glove compartment door makes an annoying sound over bumps and on bad roads. I took the door apart today and there is spring in the lock/closing that seems loose. Does anybody know if you can buy just the lock/closing mechanism as a seperate part or do I have to spend a fortune on a complete new boxdoor?

Second issue is the cover behind the steering wheel. The cover is made up by 2 plastic parts and there some play in the cover that sometimes makes the steering adjustment lever hit it and makes it hard to adjust the wheel. I also took that apart today and found that the play is in the alu/iron part under the cover, not the cover??!! Is this supposed to be like that? Anybody any experience with this?

Thanks
RF