I've got two REALLY annoying problems with my locks.
The first one is the passenger door, the handle seems to be up / in the open position and not spring back down. When I open the door from the inside, sometimes it only unlocks it a little and when you pull the door it still catches and needs another pull on the inside handle to open it. It can be a bugger to open it with a key from the outside too, you have to keep putting the handle up and down.

The second problem is the petrol cap barrel. It has proper f**ked up. You unlock it then when you go to put it back in, you can't turn the key. I got pissed of with trying to do it today so I've left it off, it has a valve in the pipe to stop any crap getting down there for now.
I attempted to strip it and found the barrel just comes out of the plastic and is a sealed unit.

Has anyone had any of these problems and managed to solve them?
The car is a 1996 Mk3 Fiesta Classic.

Thanks in advance.