Some cppcheck cleaning

Change-Id: I559eaa5195f2f88ae79349162e136e845d462e9f