Fix uncovered buffer overruns.