#2322267 Fix notices.