Added output fixes.