Various fixes in moving towards construct.text.0.0.1