more fixes of admin commands