bug fixes after admin transition