Upgraded cables and an unswitched mains socket did it for me.