Changes as per cppcheck