Merge "Minor coverity issue fixes" into devel/master