Missed a few std::min/std::max replacements