Index: src/text/fmt/xp/fv_View.cpp
===================================================================
--- src/text/fmt/xp/fv_View.cpp	(revision 29904)
+++ src/text/fmt/xp/fv_View.cpp	(working copy)
@@ -11158,6 +11158,7 @@
 			pLine = static_cast<fp_Line *>(pBL->getFirstContainer());
 		if (pLine)
 			pRun = pLine->getFirstRun();
+		iCount++;    // Extra character at the end of block
 	}
 
 	//wCount.words_no_hdrftr = wCount.word - wCount.words_no_hdrftr;
Index: src/af/gr/xp/gr_CairoGraphics.cpp
===================================================================
--- src/af/gr/xp/gr_CairoGraphics.cpp	(revision 30384)
+++ src/af/gr/xp/gr_CairoGraphics.cpp	(working copy)
@@ -981,6 +981,12 @@
 	// we did our calculations at notional 100%
 	RI->m_iZoom = 100;
 
+	// Make sure that s_pOwnerUTF8 and s_pOwnerLogAttrs are not referencing RI
+	if (RI->s_pOwnerLogAttrs == RI)
+		RI->s_pOwnerLogAttrs = NULL;
+	if (RI->s_pOwnerUTF8 == RI)
+		RI->s_pOwnerUTF8 = NULL;
+
 	return true;
 }