Gcov related changes