Patch output cleanups