[MAT-387] Correct dispatch signatures