[#58683852] Fix notices