Looks like the issue was related to Remove common program groups from Start Menu being enabled under User Configuration/Administrative Templates/Start Menu and Taskbar in a different GPO. Unchecked, reset profile and all working now apart from hiding the Windows Security icon but I can live with that for the time being.