Multiple matrix-related changes