Bug fixes through ndn-ns3.cpp, changed to util class