Matrix mult fixes