Yet another portion of fixing notices