Admin small enhancements and fixes