Also, when a shortcut is added to the Desktop, I get error...
"Component XXX.exe has both per-user and per-machine data with a per-machine KeyPath"
So it would seem that although I have a per-machine install the Desktop is referring to the user desktop rather than the Public Desktop (C:\Users ...