Fix union use issues