[MAT-387] More const