File encoding and wrap width fixes