Managed to find some of those genuine undertray self locking screws (the ones made from unobtanium) on ebay (tried the shiny ones but didn't like them). Made some washers from an old inner tube and they now fit better than the originals (they probably don't but it feels that way when you succeed!).