Minor Perf Tweaks

Also fix for outputsize