Fixes to enum and "Flare"