Fix cppcheck 1.64 warnings

Related to #1487

Change-Id: I223289d71e0dfc426f382d1bcb53b3509202779f