diff --git a/lib/VMCore/ConstantPool.cpp b/lib/VMCore/ConstantPool.cpp
index 7f2f30a6064..bb61b33f5e6 100644
--- a/lib/VMCore/ConstantPool.cpp
+++ b/lib/VMCore/ConstantPool.cpp
@@ -296,8 +296,7 @@ string ConstPoolUInt::getStrValue() const {
 }
 
 string ConstPoolFP::getStrValue() const {
-  assert(0 && "FP Constants Not implemented yet!!!!!!!!!!!");
-  return "% FP Constants NI!" /* + dtostr(Val)*/;
+  return ftostr(Val);
 }
 
 string ConstPoolType::getStrValue() const {
@@ -429,8 +428,8 @@ bool ConstPoolFP::isValueValidForType(const Type *Ty, double Val) {
     return false;         // These can't be represented as floating point!
 
     // TODO: Figure out how to test if a double can be cast to a float!
-    /*
   case Type::FloatTyID:
+    /*
     return (Val <= UINT8_MAX);
     */
   case Type::DoubleTyID:
diff --git a/lib/VMCore/iMemory.cpp b/lib/VMCore/iMemory.cpp
index a003e89a105..2f2c6c115ff 100644
--- a/lib/VMCore/iMemory.cpp
+++ b/lib/VMCore/iMemory.cpp
@@ -86,7 +86,9 @@ StoreInst::StoreInst(Value *Val, Value *Ptr, const vector<ConstPoolVal*> &Idx,
 GetElementPtrInst::GetElementPtrInst(Value *Ptr, 
 				     const vector<ConstPoolVal*> &Idx,
 				     const string &Name = "")
-  : MemAccessInst(PointerType::getPointerType(getIndexedType(Ptr->getType(), Idx, true)), GetElementPtr, Name) {
+  : MemAccessInst(PointerType::getPointerType(getIndexedType(Ptr->getType(),
+							     Idx, true)),
+		  GetElementPtr, Name) {
   assert(getIndexedType(Ptr->getType(), Idx, true) && "gep operands invalid!");
   Operands.reserve(1+Idx.size());
   Operands.push_back(Use(Ptr, this));