Quick changes to update for latest core.matrix release