Tweaks to GetPlayerMenu fix.