Fix some message field lookups for class mapping