Update to use latest matrix-api