fixes for gcov build