- further bugfixes from coverity