Corrected some issues that came from the changing of enums.