Adding more ZWNJ fixes by Reza1615