- more fixes from coverity