Bug fixes
Fix text support for layers dropping the matrix.