Make changes to avoid notices