diff --git a/libraries/chain/CMakeLists.txt b/libraries/chain/CMakeLists.txt
index 2c94b538..388fa5a9 100644
--- a/libraries/chain/CMakeLists.txt
+++ b/libraries/chain/CMakeLists.txt
@@ -58,7 +58,7 @@ add_library( graphene_chain
              withdraw_permission_evaluator.cpp
              worker_evaluator.cpp
              confidential_evaluator.cpp
-             special_authority.cpp
+             special_authority_evaluation.cpp
              buyback.cpp
 
              account_object.cpp
diff --git a/libraries/chain/account_evaluator.cpp b/libraries/chain/account_evaluator.cpp
index 515108ec..91e6f623 100644
--- a/libraries/chain/account_evaluator.cpp
+++ b/libraries/chain/account_evaluator.cpp
@@ -29,7 +29,7 @@
 #include <graphene/chain/exceptions.hpp>
 #include <graphene/chain/hardfork.hpp>
 #include <graphene/chain/internal_exceptions.hpp>
-#include <graphene/chain/special_authority.hpp>
+#include <graphene/chain/special_authority_evaluation.hpp>
 #include <graphene/chain/special_authority_object.hpp>
 #include <graphene/chain/worker_object.hpp>
 
diff --git a/libraries/chain/evaluator.cpp b/libraries/chain/evaluator.cpp
index ed32f5ef..638df2bd 100644
--- a/libraries/chain/evaluator.cpp
+++ b/libraries/chain/evaluator.cpp
@@ -56,7 +56,7 @@ database& generic_evaluator::db()const { return trx_state->db(); }
       fee_paying_account = &account_id(d);
       fee_paying_account_statistics = &fee_paying_account->statistics(d);
 
-      fee_asset = &asset_id_type(fee.asset_id)(d);
+      fee_asset = &fee.asset_id(d);
       fee_asset_dyn_data = &fee_asset->dynamic_asset_data_id(d);
 
       if( d.head_block_time() > HARDFORK_419_TIME )
diff --git a/libraries/chain/get_config.cpp b/libraries/chain/get_config.cpp
index 6c30a534..285bcb37 100644
--- a/libraries/chain/get_config.cpp
+++ b/libraries/chain/get_config.cpp
@@ -74,7 +74,6 @@ fc::variant_object get_config()
    result[ "GRAPHENE_MAX_COLLATERAL_RATIO" ] = GRAPHENE_MAX_COLLATERAL_RATIO;
    result[ "GRAPHENE_DEFAULT_MAINTENANCE_COLLATERAL_RATIO" ] = GRAPHENE_DEFAULT_MAINTENANCE_COLLATERAL_RATIO;
    result[ "GRAPHENE_DEFAULT_MAX_SHORT_SQUEEZE_RATIO" ] = GRAPHENE_DEFAULT_MAX_SHORT_SQUEEZE_RATIO;
-   result[ "GRAPHENE_DEFAULT_MARGIN_PERIOD_SEC" ] = GRAPHENE_DEFAULT_MARGIN_PERIOD_SEC;
    result[ "GRAPHENE_DEFAULT_MAX_WITNESSES" ] = GRAPHENE_DEFAULT_MAX_WITNESSES;
    result[ "GRAPHENE_DEFAULT_MAX_COMMITTEE" ] = GRAPHENE_DEFAULT_MAX_COMMITTEE;
    result[ "GRAPHENE_DEFAULT_MAX_PROPOSAL_LIFETIME_SEC" ] = GRAPHENE_DEFAULT_MAX_PROPOSAL_LIFETIME_SEC;
diff --git a/libraries/chain/include/graphene/chain/config.hpp b/libraries/chain/include/graphene/chain/config.hpp
index 2a13a162..9b9b6dce 100644
--- a/libraries/chain/include/graphene/chain/config.hpp
+++ b/libraries/chain/include/graphene/chain/config.hpp
@@ -153,7 +153,7 @@
 #define GRAPHENE_RECENTLY_MISSED_COUNT_INCREMENT             4
 #define GRAPHENE_RECENTLY_MISSED_COUNT_DECREMENT             3
 
-#define GRAPHENE_CURRENT_DB_VERSION                          "PPY2.3"
+#define GRAPHENE_CURRENT_DB_VERSION                          "PPY2.5"
 
 #define GRAPHENE_IRREVERSIBLE_THRESHOLD                      (70 * GRAPHENE_1_PERCENT)
 
diff --git a/libraries/chain/include/graphene/chain/special_authority.hpp b/libraries/chain/include/graphene/chain/special_authority_evaluation.hpp
similarity index 100%
rename from libraries/chain/include/graphene/chain/special_authority.hpp
rename to libraries/chain/include/graphene/chain/special_authority_evaluation.hpp
diff --git a/libraries/chain/special_authority.cpp b/libraries/chain/special_authority_evaluation.cpp
similarity index 96%
rename from libraries/chain/special_authority.cpp
rename to libraries/chain/special_authority_evaluation.cpp
index a92cc5e9..3c007f25 100644
--- a/libraries/chain/special_authority.cpp
+++ b/libraries/chain/special_authority_evaluation.cpp
@@ -22,7 +22,7 @@
  * THE SOFTWARE.
  */
 
-#include <graphene/chain/special_authority.hpp>
+#include <graphene/chain/special_authority_evaluation.hpp>
 #include <graphene/chain/database.hpp>
 
 #include <fc/io/raw.hpp>
diff --git a/libraries/protocol/include/graphene/protocol/config.hpp b/libraries/protocol/include/graphene/protocol/config.hpp
index 6f1f6da4..8ea4bcc5 100644
--- a/libraries/protocol/include/graphene/protocol/config.hpp
+++ b/libraries/protocol/include/graphene/protocol/config.hpp
@@ -44,6 +44,13 @@
 
 #define GRAPHENE_IRREVERSIBLE_THRESHOLD                      (70 * GRAPHENE_1_PERCENT)
 
+/**
+ * every second, the fraction of burned core asset which cycles is
+ * GRAPHENE_CORE_ASSET_CYCLE_RATE / (1 << GRAPHENE_CORE_ASSET_CYCLE_RATE_BITS)
+ */
+#define GRAPHENE_CORE_ASSET_CYCLE_RATE                        17
+#define GRAPHENE_CORE_ASSET_CYCLE_RATE_BITS                   32
+
 /**
  * Don't allow the committee_members to publish a limit that would
  * make the network unable to operate.
@@ -109,7 +116,6 @@
 #define GRAPHENE_DEFAULT_MAINTENANCE_COLLATERAL_RATIO   1750 ///< Call when collateral only pays off 175% the debt
 #define GRAPHENE_DEFAULT_MAX_SHORT_SQUEEZE_RATIO        1500 ///< Stop calling when collateral only pays off 150% of the debt
 ///@}
-#define GRAPHENE_DEFAULT_MARGIN_PERIOD_SEC              (30*60*60*24)
 
 /**
  *  Reserved Account IDs with special meaning
diff --git a/libraries/wallet/wallet.cpp b/libraries/wallet/wallet.cpp
index c379b845..55530ecb 100644
--- a/libraries/wallet/wallet.cpp
+++ b/libraries/wallet/wallet.cpp
@@ -80,7 +80,7 @@
 #include <graphene/bookie/bookie_api.hpp>
 
 #include <graphene/protocol/fee_schedule.hpp>
-#include <graphene/protocol/fee_schedule.hpp>
+#include <graphene/chain/hardfork.hpp>
 #include <graphene/utilities/git_revision.hpp>
 #include <graphene/utilities/key_conversion.hpp>
 #include <graphene/utilities/words.hpp>