More fixes for redirect vs. regular output, thanks to wernisman