Matrix fixes