Handle texts of depth 1, and other fixes