pull admin fixes from upstream.