more admin.php fixes