fix further coverity issues