Fix enums and synthesizing