TRQ-2691 Fixed a few more coverity issues.