More futzing with admin shortcuts