More coverity buffer overflow fixes