Mk1 Yaris CD Player

[HowshA]

Hi all, a bit new to all this. Recently bought a 1.0 2004 T3 Yaris as a first car and love it to bits. However the built in CD player is a bit temperamental; it will only eject cds occasionally, you can be pressing the eject button for hours and it won't work then suddenly it works first time. The same goes for the audio power button on the other side. 

The CD player plays fine and all other buttons work, I only have an issue with the above mentioned 2. 

Has anyone else experienced this or have any fixes? Is it worth putting an after market in? 

Thanks. 

[bathtub tom]

May be worth trying some electrical contact spray around the buttons. Might not work, but if it does it'll be considerably cheaper than any other options and shouldn't do any harm.

[HowshA]

Would a 7inch cd unit fit the the t2 blank head unit and would it be worth fitting?