More Coverity issues addressed.
Passed
Rob Swindell
created pipeline for commit
40953725
, finished
For master
9 minutes 53 seconds, queued for 12 seconds