diff --git a/lib/ExecutionEngine/Interpreter/Execution.cpp b/lib/ExecutionEngine/Interpreter/Execution.cpp
index 909f568a582..ac011d743be 100644
--- a/lib/ExecutionEngine/Interpreter/Execution.cpp
+++ b/lib/ExecutionEngine/Interpreter/Execution.cpp
@@ -823,7 +823,7 @@ static GenericValue executeGEPOperation(Value *Ptr, User::op_iterator I,
 
       // Get the index number for the array... which must be uint type...
       assert((*I)->getType() == Type::LongTy);
-      unsigned Idx = getOperandValue(*I, SF).UIntVal;
+      unsigned Idx = getOperandValue(*I, SF).LongVal;
       if (const ArrayType *AT = dyn_cast<ArrayType>(ST))
         if (Idx >= AT->getNumElements() && ArrayChecksEnabled) {
           cerr << "Out of range memory access to element #" << Idx
diff --git a/lib/ExecutionEngine/Interpreter/ExternalFunctions.cpp b/lib/ExecutionEngine/Interpreter/ExternalFunctions.cpp
index 1a425c2bb62..5b57aa75664 100644
--- a/lib/ExecutionEngine/Interpreter/ExternalFunctions.cpp
+++ b/lib/ExecutionEngine/Interpreter/ExternalFunctions.cpp
@@ -14,7 +14,6 @@
 #include "llvm/DerivedTypes.h"
 #include <map>
 #include <dlfcn.h>
-#include <iostream>
 #include <link.h>
 #include <math.h>
 #include <stdio.h>