Another attempt to fix unterminated strings

Coverity still complains about strings which are not null-terminated. Trying to "fix" it again.