Fixes for issue #308 (edits to text elements don't always save in Draw steps)