Fix coverity reports 54033 & 54034