Various fixes for Morphic and Text (thanks Ken)