Notice.php adjustments