Fixed the rest of the duplicated notice messages.