[fix] More coverity issues fixed