diff --git a/CHANGELOG.md b/CHANGELOG.md
index 33333bded2..b434330c34 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,31 +6,23 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Releases
 
-### [5.0.16]
-
-#### Added
- - NEW
+### [5.0.17]
 
 #### Fixed
- - [PPC. Fix onboarding validation (#1085)](https://github.com/eventespresso/cafe/pull/1085)
- - [ES. Fix onboarding in Live mode (#1087)](https://github.com/eventespresso/cafe/pull/1087)
- - [Fix text wrapping in the event editor (#1078)](https://github.com/eventespresso/cafe/pull/1078)
- - FIX
+ - [Fix PHP Fatal error: Uncaught TypeError: Cannot assign int to property EE_Template_Config:: of type bool (#1102)](https://github.com/eventespresso/cafe/pull/1102)
 
 #### Changed
- - [Mod/core/bm changes 5 0 15 (#1075)](https://github.com/eventespresso/cafe/pull/1075)
- - MOD
-
-#### Deprecated
- - DEP
+ - [BuildMachine 5.0.16.p changes (#1088)](https://github.com/eventespresso/cafe/pull/1088)
+ - [Prevent fatal error from get_edit_post_link returning null (#1097)](https://github.com/eventespresso/cafe/pull/1097)
 
-#### Removed
- - RMV
-
-#### Security
- - SEC
+### [5.0.16]
 
+#### Fixed
+ - [PPC. Fix onboarding validation (#1085)](https://github.com/eventespresso/cafe/pull/1085)
+ - [Fix text wrapping in the event editor (#1078)](https://github.com/eventespresso/cafe/pull/1078)
 
+#### Changed
+ - [BuildMachine 5.0.16.p changes (#1088)](https://github.com/eventespresso/cafe/pull/1088)
 
 ### [5.0.15]
 
diff --git a/core/EE_Config.core.php b/core/EE_Config.core.php
index 6e674d0423..11128e11fa 100644
--- a/core/EE_Config.core.php
+++ b/core/EE_Config.core.php
@@ -2780,7 +2780,7 @@ class EE_Template_Config extends EE_Config_Base
 
     public string $current_espresso_theme = '';
 
-    public bool $display_address_in_regform = true;
+    public $display_address_in_regform = true;
 
     /**
      * @var bool|int|string|null $enable_default_style
diff --git a/core/admin/EE_Admin_Page_CPT.core.php b/core/admin/EE_Admin_Page_CPT.core.php
index 48f8078585..777a092a75 100644
--- a/core/admin/EE_Admin_Page_CPT.core.php
+++ b/core/admin/EE_Admin_Page_CPT.core.php
@@ -1158,11 +1158,11 @@ public function revision_redirect(string $location): string
     /**
      * Modify the edit post link generated by wp core function so that EE CPTs get setup differently.
      *
-     * @param string $link    the original generated link
-     * @param int    $id      post id
-     * @return string          the link
+     * @param null|string $link     the original generated link
+     * @param int    $id            post id
+     * @return string               the link
      */
-    public function modify_edit_post_link(string $link, int $id): string
+    public function modify_edit_post_link(?string $link, int $id): ?string
     {
         $post = get_post($id);
         $action = $this->request->getRequestParam('action');
@@ -1185,13 +1185,13 @@ public function modify_edit_post_link(string $link, int $id): string
      * Modify the trash link on our cpt edit pages so it has the required query var for triggering redirect properly on
      * our routes.
      *
-     * @param string $delete_link  original delete link
-     * @param int    $post_id      id of cpt object
-     * @return string new delete link
+     * @param null|string $delete_link      original delete link
+     * @param int    $post_id               id of cpt object
+     * @return null|string                  new delete link
      * @throws EE_Error
      * @throws ReflectionException
      */
-    public function modify_delete_post_link(string $delete_link, int $post_id): string
+    public function modify_delete_post_link(?string $delete_link, int $post_id): ?string
     {
         $post = get_post($post_id);
         $action = $this->request->getRequestParam('action');
diff --git a/espresso.php b/espresso.php
index 99cd972106..143acf5f2d 100644
--- a/espresso.php
+++ b/espresso.php
@@ -3,7 +3,7 @@
   Plugin Name:Event Espresso
   Plugin URI: https://eventespresso.com/pricing/?ee_ver=ee4&utm_source=ee4_plugin_admin&utm_medium=link&utm_campaign=wordpress_plugins_page&utm_content=support_link
   Description: Manage events, sell tickets, and receive payments from your WordPress website. Reduce event administration time, cut-out ticketing fees, and own your customer data. | <a href="https://eventespresso.com/add-ons/?utm_source=plugin_activation_screen&utm_medium=link&utm_campaign=plugin_description">Extensions</a> | <a href="https://eventespresso.com/pricing/?utm_source=plugin_activation_screen&utm_medium=link&utm_campaign=plugin_description">Sales</a> | <a href="admin.php?page=espresso_support">Support</a>
-  Version: 5.0.17.rc.000
+  Version: 5.0.17.rc.003
   Author: Event Espresso
   Author URI: http://eventespresso.com/?ee_ver=ee4&utm_source=ee4_plugin_admin&utm_medium=link&utm_campaign=wordpress_plugins_page&utm_content=support_link
   License: GPLv3
@@ -104,7 +104,7 @@ function espresso_minimum_php_version_error()
          */
         function espresso_version(): string
         {
-            return apply_filters('FHEE__espresso__espresso_version', '5.0.17.rc.000');
+            return apply_filters('FHEE__espresso__espresso_version', '5.0.17.rc.003');
         }
 
         /**