yaris warning lights

[JGG]

Anyone out there had any problems with the warning lights coming on at irregular intervals? Problems started at 12 months old, (with Yaris 1.3GLS), when the engine shaped light kept coming on at odd intervals. Local dealer investigated and eventually fitted some new part that seemed to sort it out. Within 2 weeks though the Air Bag warning light started to light intermittently (but initially never when I had chance to visit the dealer). I did eventually manage to take it in when the light was on and, after plugging it into the diagnostic thing, they told me that it was 'looking like' the air bag warning switch/relay & it is booked in to have this changed (along with the brake pipe recall part) in a couple of weeks. Today though the engine shaped warning light has started to come on again (sometimes both are lit at the same time)!!!!!!

Anyone any ideas?