Fix EntityTypeID constructors