Merge pull request #415 from jvbsl/fix/missing-and-wrong-enums

Fix/missing and wrong enums