(fix) upstream enum changes