More MatrixReloaded changes