More improvements on notices