Minor cleanup, attempt to use utf-8 output charset