- more coverity based fixes