some tweaks to Admin stuff