Saving game core overrides in Retroarch

[Wayne100]

Hi, I am literally puling my hair out - whats left of it. Probably missing something stupid, but here goes:-

I have set up the Beetle PSX HW core now, got it running pretty well (to be honest, looks like a good core). However, a few games need the core specific options tweaking a bit (ie CPU Overclock, PGXP Mode etc).

I am trying to save Game core overrides for these games, but all that seems to happen is the settings are saved for every game on the core, not just that specific game?

I have saved my basic overall settings using 'Save Core Overrides', and then I am trying to 'Save Game Overrides' for the odd games that need tweaking. I have disabled 'Save settings on Exit', but no change. 

Any help much appreciated!