diff --git a/lib/ExecutionEngine/Interpreter/Execution.cpp b/lib/ExecutionEngine/Interpreter/Execution.cpp
index 3ecc3ec..d88d91f 100644
--- a/lib/ExecutionEngine/Interpreter/Execution.cpp
+++ b/lib/ExecutionEngine/Interpreter/Execution.cpp
@@ -25,7 +25,7 @@
   case Type::TY##TyID: Result.TY##Val = ((CLASS*)CPV)->getValue(); break
 
 static GenericValue getOperandValue(Value *V, ExecutionContext &SF) {
-  if (ConstPoolVal *CPV = V->castConstant()) {
+  if (ConstPoolVal *CPV = dyn_cast<ConstPoolVal>(V)) {
     GenericValue Result;
     switch (CPV->getType()->getPrimitiveID()) {
       GET_CONST_VAL(Bool   , ConstPoolBool);
@@ -48,7 +48,7 @@
 }
 
 static void printOperandInfo(Value *V, ExecutionContext &SF) {
-  if (!V->isConstant()) {
+  if (!isa<ConstPoolVal>(V)) {
     unsigned TyP  = V->getType()->getUniqueID();   // TypePlane for value
     unsigned Slot = getOperandSlot(V);
     cout << "Value=" << (void*)V << " TypeID=" << TyP << " Slot=" << Slot
diff --git a/lib/ExecutionEngine/Interpreter/UserInput.cpp b/lib/ExecutionEngine/Interpreter/UserInput.cpp
index eb5725f..e9fc9db 100644
--- a/lib/ExecutionEngine/Interpreter/UserInput.cpp
+++ b/lib/ExecutionEngine/Interpreter/UserInput.cpp
@@ -134,7 +134,7 @@
   vector<Value*> Options = LookupMatchingNames(Name);
 
   for (unsigned i = 0; i < Options.size(); ++i) { // Remove nonmethod matches...
-    if (!Options[i]->isMethod()) {
+    if (!isa<Method>(Options[i])) {
       Options.erase(Options.begin()+i);
       --i;
     }