[fix] More fixes for coverity