Apply enum fallbacks and validate their… — Code review | OneNoughtOne