Fix union/bits string mapping