Minor changes. Ignored coverity related stuff.