diff --git a/src/gsupplicant.c b/src/gsupplicant.c
index 08d73ec..dce4a41 100644
--- a/src/gsupplicant.c
+++ b/src/gsupplicant.c
@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2015-2018 Jolla Ltd.
- * Contact: Slava Monich <slava.monich@jolla.com>
+ * Copyright (C) 2015-2019 Jolla Ltd.
+ * Copyright (C) 2015-2019 Slava Monich <slava.monich@jolla.com>
  *
  * You may use this file under the terms of BSD license as follows:
  *
@@ -13,9 +13,9 @@
  *   2. Redistributions in binary form must reproduce the above copyright
  *      notice, this list of conditions and the following disclaimer in the
  *      documentation and/or other materials provided with the distribution.
- *   3. Neither the name of Jolla Ltd nor the names of its contributors may
- *      be used to endorse or promote products derived from this software
- *      without specific prior written permission.
+ *   3. Neither the names of the copyright holders nor the names of its
+ *      contributors may be used to endorse or promote products derived
+ *      from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
  * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
@@ -375,7 +375,7 @@ gsupplicant_emit_pending_signals(
     GSUPPLICANT_SIGNAL sig;
     gboolean valid_changed;
 
-    /* Handlers could drops their references to us */
+    /* Handlers could drop their references to us */
     gsupplicant_ref(self);
 
     /* VALID is the last one to be emitted if we BECOME valid */
@@ -403,8 +403,8 @@ gsupplicant_emit_pending_signals(
             SIGNAL_VALID_CHANGED, GSUPPLICANT_PROPERTY_VALID);
     }
 
-    /* Handlers could drops their references to us */
-    gsupplicant_ref(self);
+    /* And release the temporary reference */
+    gsupplicant_unref(self);
 }
 
 static