Minor cleanups; ascii->utf-8 for encoding