diff --git a/datacontainer.cpp b/datacontainer.cpp
index 10f6a710b..457d8c53d 100644
--- a/datacontainer.cpp
+++ b/datacontainer.cpp
@@ -80,7 +80,7 @@ void DataContainer::checkForUpdate()
     }
 }
 
-uint DataContainer::timeSinceLastUpdate() const
+int DataContainer::timeSinceLastUpdate() const
 {
     int msec = QTime::currentTime().msec();
     if (msec < d->updateTs) {
@@ -124,7 +124,7 @@ void DataContainer::connectVisualization(QObject* visualization, uint updateInte
                     visualization, SLOT(updated(QString,Plasma::DataEngine::Data)));
 
             if (relay->isUnused()) {
-                d->relays.erase(d->relays.find(relay->m_interval));
+                d->relays.remove(relay->m_interval);
                 delete relay;
             }
 //            kDebug() << "     already connected, but to a relay";
@@ -173,7 +173,7 @@ void DataContainer::disconnectVisualization(QObject* visualization)
                    visualization, SLOT(updated(QString,Plasma::DataEngine::Data)));
 
         if (relay->isUnused()) {
-            d->relays.erase(d->relays.find(relay->m_interval));
+            d->relays.remove(relay->m_interval);
             delete relay;
         }
 
diff --git a/datacontainer.h b/datacontainer.h
index f0a8d8345..c1963badf 100644
--- a/datacontainer.h
+++ b/datacontainer.h
@@ -84,7 +84,7 @@ class PLASMA_EXPORT DataContainer : public QObject
         /**
          * Returns how long ago, in msecs, that the data in this container was last updated
          **/
-        uint timeSinceLastUpdate() const;
+        int timeSinceLastUpdate() const;
 
         /**
          * @internal
diff --git a/dataengine.cpp b/dataengine.cpp
index e7893b526..84f61e378 100644
--- a/dataengine.cpp
+++ b/dataengine.cpp
@@ -347,7 +347,7 @@ int DataEngine::minimumUpdateInterval() const
     return d->minUpdateFreq;
 }
 
-void DataEngine::setupdateInterval(uint frequency)
+void DataEngine::setUpdateInterval(uint frequency)
 {
     killTimer(d->updateTimerId);
     d->updateTimerId = 0;
diff --git a/dataengine.h b/dataengine.h
index e6122c211..efc9bd4ca 100644
--- a/dataengine.h
+++ b/dataengine.h
@@ -231,8 +231,8 @@ class PLASMA_EXPORT DataEngine : public QObject
         /**
          * Called by internal updating mechanisms to trigger the engine
          * to refresh the data contained in a given source. Reimplement this
-         * method when using facilities such as setupdateInterval.
-         * @see setupdateInterval
+         * method when using facilities such as setUpdateInterval.
+         * @see setUpdateInterval
          *
          * @param source the name of the source that should be updated
          * @return true if the data was changed, or false if there was no
@@ -325,11 +325,11 @@ class PLASMA_EXPORT DataEngine : public QObject
          * @param frequency the time, in milliseconds, between updates. A value of 0
          *                  will stop internally triggered updates.
          **/
-        void setupdateInterval(uint frequency);
+        void setUpdateInterval(uint frequency);
 
         /**
          * Returns the current update frequency.
-         * @see setupdateInterval
+         * @see setUpdateInterval
          NOTE: This is not implemented to prevent having to store the value internally.
                When there is a good use case for needing access to this value, we can
                add another member to the Private class and add this method.