admin-stop fixes