Fix some strange bugs from a resolution of conflicts in merge.

Also fix the representation of zone in Characteristics fragment.