Notices and Warnings cleanup & improvements for local testing