Fix (untested) outputs for presentation-mode