diff --git a/cpp/include/Ice/Proxy.h b/cpp/include/Ice/Proxy.h
index c3499ab7ac8..9dbc5598cf3 100644
--- a/cpp/include/Ice/Proxy.h
+++ b/cpp/include/Ice/Proxy.h
@@ -173,7 +173,7 @@ namespace Ice
 
         /**
          * Obtains a proxy that is identical to this proxy, except for the invocation timeout.
-         * @param timeout The new invocation timeout (in milliseconds).
+         * @param timeout The new invocation timeout.
          * @return A proxy with the new timeout.
          */
         template<class Rep, class Period>
@@ -205,7 +205,7 @@ namespace Ice
 
         /**
          * Obtains a proxy that is identical to this proxy, except for the locator cache timeout.
-         * @param timeout The new locator cache timeout (in seconds).
+         * @param timeout The new locator cache timeout.
          * @return A proxy with the new timeout.
          */
         template<class Rep, class Period>
diff --git a/cpp/src/Ice/ReferenceFactory.cpp b/cpp/src/Ice/ReferenceFactory.cpp
index aad4e826417..9fee367150a 100644
--- a/cpp/src/Ice/ReferenceFactory.cpp
+++ b/cpp/src/Ice/ReferenceFactory.cpp
@@ -855,9 +855,8 @@ IceInternal::ReferenceFactory::create(
         property = propertyPrefix + ".LocatorCacheTimeout";
         if (!properties->getProperty(property).empty())
         {
-            int locatorCacheTimeoutValue = properties->getPropertyAsIntWithDefault(
-                property,
-                static_cast<int32_t>(locatorCacheTimeout.count()));
+            int locatorCacheTimeoutValue =
+                properties->getPropertyAsIntWithDefault(property, static_cast<int32_t>(locatorCacheTimeout.count()));
             if (locatorCacheTimeoutValue < -1)
             {
                 locatorCacheTimeoutValue = -1;
@@ -872,9 +871,8 @@ IceInternal::ReferenceFactory::create(
         property = propertyPrefix + ".InvocationTimeout";
         if (!properties->getProperty(property).empty())
         {
-            int invocationTimeoutValue = properties->getPropertyAsIntWithDefault(
-                property,
-                static_cast<int32_t>(invocationTimeout.count()));
+            int invocationTimeoutValue =
+                properties->getPropertyAsIntWithDefault(property, static_cast<int32_t>(invocationTimeout.count()));
             if (invocationTimeoutValue < 1 && invocationTimeoutValue != -1)
             {
                 invocationTimeoutValue = -1;
diff --git a/matlab/src/ObjectPrx.cpp b/matlab/src/ObjectPrx.cpp
index 8335fa95820..976f890f544 100644
--- a/matlab/src/ObjectPrx.cpp
+++ b/matlab/src/ObjectPrx.cpp
@@ -564,7 +564,7 @@ extern "C"
     mxArray* Ice_ObjectPrx_ice_getInvocationTimeout(void* self)
     {
         chrono::milliseconds timeout = restoreProxy(self)->ice_getInvocationTimeout();
-        return createResultValue(createInt(static_cast<int32_t>>(timeout.count())));
+        return createResultValue(createInt(static_cast<int32_t>(timeout.count())));
     }
 
     mxArray* Ice_ObjectPrx_ice_invocationTimeout(void* self, void** r, int t)