PROBCORE-64 made some minor changes.