More unicode output fixes.