#1 is still unfixed. Fixed default stream dupe.