Some minor tweaks to get Admin links to work