Etexts: Fix bugs I just introduced, make other updates [2.7] #11625