Improve sanity
These output paths are far more sane than previously.