administration bug fixes