Fixed most bugs from changes (enums, etc.).