Minor updates in Matrix