diff --git a/include/llvm/IntrinsicInst.h b/include/llvm/IntrinsicInst.h
index e82663debcc..857e4cbeb13 100644
--- a/include/llvm/IntrinsicInst.h
+++ b/include/llvm/IntrinsicInst.h
@@ -74,10 +74,10 @@ namespace llvm {
   struct DbgStopPointInst : public DbgInfoIntrinsic {
 
     unsigned getLineNo() const {
-      return cast<ConstantInt>(getOperand(2))->getRawValue();
+      return unsigned(cast<ConstantInt>(getOperand(2))->getRawValue());
     }
     unsigned getColNo() const {
-      return cast<ConstantInt>(getOperand(3))->getRawValue();
+      return unsigned(cast<ConstantInt>(getOperand(3))->getRawValue());
     }
     Value *getContext() const { return const_cast<Value*>(getOperand(4)); }
 
diff --git a/include/llvm/System/TimeValue.h b/include/llvm/System/TimeValue.h
index e8a8365c4e8..c8461d23b00 100644
--- a/include/llvm/System/TimeValue.h
+++ b/include/llvm/System/TimeValue.h
@@ -314,7 +314,7 @@ namespace sys {
     /// @brief Converts from microsecond format to TimeValue format
     void usec( int64_t microseconds ) {
       this->seconds_ = microseconds / MICROSECONDS_PER_SECOND;
-      this->nanos_ = (microseconds % MICROSECONDS_PER_SECOND) * 
+      this->nanos_ = NanoSecondsType(microseconds % MICROSECONDS_PER_SECOND) * 
         NANOSECONDS_PER_MICROSECOND;
       this->normalize();
     }
@@ -322,7 +322,7 @@ namespace sys {
     /// @brief Converts from millisecond format to TimeValue format
     void msec( int64_t milliseconds ) {
       this->seconds_ = milliseconds / MILLISECONDS_PER_SECOND;
-      this->nanos_ = (milliseconds % MILLISECONDS_PER_SECOND) * 
+      this->nanos_ = NanoSecondsType(milliseconds % MILLISECONDS_PER_SECOND) * 
         NANOSECONDS_PER_MILLISECOND;
       this->normalize();
     }