fixes for TextCell, basically routing around dual mode