More API doc and admin env cleanups