- a few more coverity reported fixes