Report and exception cleanups