Fixed a couple bugs with enums -- one a major mistake in the declarative portion, the other a type conflict