MDL-23545 question: fix remaining sizes leading to failures