Fix last coverity defects (Jochen)