Core changes to admin.php