Minor coverity issue fixes