Repaired my fog light switch, just a case of stripping it and cleaning the contacts.
Then I set about replacing the lock in my fuel cap. I had a look at busters guide but it doesn't go as far as the lock, a search on here and google didn't help, most people saying it's not possible but I like a challenge. If you follow busters guide to dismantle the cap, once you get to the lock itself there is no way to release it from its housing however if you put a screwdriver between the little plate on the end of the lock barrel, the one that moves the locking bar, and prize it out the end will break off the old lock barrel allowing it to come out of the housing. then its just a case of removing the broken bits and reassembling the cap with a new lock. The only hard bit is being brave enough to break the existing barrel.