Provide better support for unicode output