diff --git a/core/org.eclipse.cdt.core/browser/org/eclipse/cdt/internal/core/browser/cache/IndexerJob2.java b/core/org.eclipse.cdt.core/browser/org/eclipse/cdt/internal/core/browser/cache/IndexerJob2.java
index 3bcfc65cdd2..51be068de3e 100644
--- a/core/org.eclipse.cdt.core/browser/org/eclipse/cdt/internal/core/browser/cache/IndexerJob2.java
+++ b/core/org.eclipse.cdt.core/browser/org/eclipse/cdt/internal/core/browser/cache/IndexerJob2.java
@@ -33,7 +33,7 @@ public abstract class IndexerJob2 implements IIndexJob {
 	protected IIndex fProjectIndex = null;
 	protected ICDTIndexer fSourceIndexer = null;
 	
-	public static final String FAMILY= "BasicTypeIndexerJob"; //$NON-NLS-1$
+	public static final String FAMILY= "IndexerJob2"; //$NON-NLS-1$
 
 	public IndexerJob2(IndexManager indexManager, IProject project) {
 		fProject = project;
diff --git a/core/org.eclipse.cdt.core/browser/org/eclipse/cdt/internal/core/browser/cache/IndexerTypesJob2.java b/core/org.eclipse.cdt.core/browser/org/eclipse/cdt/internal/core/browser/cache/IndexerTypesJob2.java
index 7956dc62808..25990d688ba 100644
--- a/core/org.eclipse.cdt.core/browser/org/eclipse/cdt/internal/core/browser/cache/IndexerTypesJob2.java
+++ b/core/org.eclipse.cdt.core/browser/org/eclipse/cdt/internal/core/browser/cache/IndexerTypesJob2.java
@@ -167,10 +167,7 @@ public class IndexerTypesJob2 extends IndexerJob2 {
                     offsetType = offsetType / 10;
                     m *= 10;
                 }
-                int mod = 1;
-                while( offset / ( mod * 10 )> 0 )
-                    mod *= 10;
-                int value = offset % mod;
+                int value = offset - ( offsetType * m );
 //                int value = Integer.valueOf(String.valueOf(offset).substring(1)).intValue();
                 
                 TypeReference typeReference = null;