diff --git a/src/core/Group.cpp b/src/core/Group.cpp
index 476742cef..50ef73093 100644
--- a/src/core/Group.cpp
+++ b/src/core/Group.cpp
@@ -42,7 +42,7 @@ Group::~Group()
     cleanupParent();
 }
 
-template <class T> bool Group::set(T& property, const T& value) {
+template <class P, class V> bool Group::set(P& property, const V& value) {
     if (property != value) {
         property = value;
         updateTimeinfo();
diff --git a/src/core/Group.h b/src/core/Group.h
index 3cbd2e573..1b4ec864e 100644
--- a/src/core/Group.h
+++ b/src/core/Group.h
@@ -94,7 +94,7 @@ Q_SIGNALS:
     void modified();
 
 private:
-    template <class T> inline bool set(T& property, const T& value);
+    template <class P, class V> inline bool set(P& property, const V& value);
 
     void addEntry(Entry* entry);
     void removeEntry(Entry* entry);
@@ -114,7 +114,7 @@ private:
     QString m_defaultAutoTypeSequence;
     TriState m_autoTypeEnabled;
     TriState m_searchingEnabled;
-    Entry* m_lastTopVisibleEntry;
+    QPointer<Entry> m_lastTopVisibleEntry;
     QList<Group*> m_children;
     QList<Entry*> m_entries;