Fixes for latest core.matrix compliance tests