diff --git a/asterix-metadata/src/main/java/edu/uci/ics/asterix/metadata/utils/DatasetUtils.java b/asterix-metadata/src/main/java/edu/uci/ics/asterix/metadata/utils/DatasetUtils.java
index db86dbb..a75f6ba 100644
--- a/asterix-metadata/src/main/java/edu/uci/ics/asterix/metadata/utils/DatasetUtils.java
+++ b/asterix-metadata/src/main/java/edu/uci/ics/asterix/metadata/utils/DatasetUtils.java
@@ -69,7 +69,7 @@
     }
 
     public static String getNodegroupName(Dataset dataset) {
-        return (((AqlCompiledInternalDatasetDetails) dataset.getDatasetDetails())).getNodegroupName();
+        return (((InternalDatasetDetails) dataset.getDatasetDetails())).getNodeGroupName();
     }
 
     // TODO: TO be removed.
diff --git a/asterix-om/src/main/java/edu/uci/ics/asterix/om/types/ARecordType.java b/asterix-om/src/main/java/edu/uci/ics/asterix/om/types/ARecordType.java
index f09605c..226bda5 100644
--- a/asterix-om/src/main/java/edu/uci/ics/asterix/om/types/ARecordType.java
+++ b/asterix-om/src/main/java/edu/uci/ics/asterix/om/types/ARecordType.java
@@ -18,7 +18,7 @@
     private IAType[] fieldTypes;
     private boolean isOpen;
     private transient final List<IRecordTypeAnnotation> annotations = new ArrayList<IRecordTypeAnnotation>();
-    private transient final Map<String, IAType> typeMap = new HashMap<String, IAType>();
+    private transient final Map<String, Integer> typeMap = new HashMap<String, Integer>();
 
     public ARecordType(String typeName, String[] fieldNames, IAType[] fieldTypes, boolean isOpen) {
         super(typeName);
@@ -26,7 +26,7 @@
         this.fieldTypes = fieldTypes;
         this.isOpen = isOpen;
         for (int i = 0; i < fieldNames.length; i++) {
-        	typeMap.put(fieldNames[i], fieldTypes[i]);
+        	typeMap.put(fieldNames[i], i);
         }
     }
 
@@ -83,7 +83,7 @@
     }
 
     public IAType getFieldType(String fieldName) {
-    	return typeMap.get(fieldName);
+    	return fieldTypes[typeMap.get(fieldName)];
     }
     
     @Override