cppcheck issues resolved.