coverity fixes for #4569
===VersionHistory:None===