diff --git a/admin.php b/admin.php
index 0499d026f..15a1c58e6 100644
--- a/admin.php
+++ b/admin.php
@@ -766,12 +766,12 @@ function save_pref ( $prefs, $src ) {
                 <div class="form-inline mt-1 mb-2"><label title="' . tooltip ( 'email-smtp-username' ) . '">'
    . translate ( 'SMTP Username' )
    . ':</label><input type="text" size="30" name="admin_SMTP_USERNAME" value="'
-   . ( $s['SMTP_USERNAME'] ?: '' )
+   . ( $s['SMTP_USERNAME'] ??= '' )
    . '"></div>
                 <div class="form-inline mt-1 mb-2"><label title="' . tooltip ( 'email-smtp-password' ) . '">'
    . translate ( 'SMTP Password' )
    . ':</label><input type="text" size="30" name="admin_SMTP_PASSWORD" value="'
-   . ( $s['SMTP_PASSWORD'] ?: '' )
+   . ( $s['SMTP_PASSWORD'] ??= '' )
    . '"></div>
               </div>
             </div>
diff --git a/includes/classes/RptEvent.php b/includes/classes/RptEvent.php
index 0f3719260..8ffa45bda 100644
--- a/includes/classes/RptEvent.php
+++ b/includes/classes/RptEvent.php
@@ -40,11 +40,18 @@ class RepeatingEvent extends Event {
    * @access private
    */
   var $_repeatEndDateTime;
+  /**
+   * The UNIX timestamp for the end date/time of the repetition.
+   * @var int
+   * @access private
+   */
+  var $_repeatEndDateTimeTS;
  /**
    * The frequency of the repetition.
    * @var int
    * @access private
    */
+  
   var $_repeatFrequency;
   /**
    * The days each week the event occurs