diff --git a/src/configuration.h b/src/configuration.h
index a742020..208a24c 100644
--- a/src/configuration.h
+++ b/src/configuration.h
@@ -102,7 +102,7 @@ Total sum of frequencies must be 256
 #define RANDOMX_FREQ_IROL_R         0
 #define RANDOMX_FREQ_ISWAP_R        4
 
-#define RANDOMX_FREQ_FSWAP_R        0
+#define RANDOMX_FREQ_FSWAP_R        8
 #define RANDOMX_FREQ_FADD_R         0
 #define RANDOMX_FREQ_FADD_M         0
 #define RANDOMX_FREQ_FSUB_R         0
@@ -117,7 +117,7 @@ Total sum of frequencies must be 256
 
 #define RANDOMX_FREQ_ISTORE        16
 
-#define RANDOMX_FREQ_NOP           95
+#define RANDOMX_FREQ_NOP           87
 /*                               ------
                                   256
 */
diff --git a/src/instruction_weights.hpp b/src/instruction_weights.hpp
index a63a610..be8415a 100644
--- a/src/instruction_weights.hpp
+++ b/src/instruction_weights.hpp
@@ -64,7 +64,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define REP33(x) REP32(x) x,
 #define REP40(x) REP32(x) REP8(x)
 #define REP64(x) REP32(x) REP32(x)
-#define REP95(x) REP64(x) REP31(x)
+#define REP87(x) REP64(x) REP23(x)
 #define REP128(x) REP32(x) REP32(x) REP32(x) REP32(x)
 #define REP232(x) REP128(x) REP40(x) REP40(x) REP24(x)
 #define REP256(x) REP128(x) REP128(x)
@@ -107,7 +107,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define REPCASE31(x) REPCASE30(x) case __COUNTER__:
 #define REPCASE32(x) REPCASE31(x) case __COUNTER__:
 #define REPCASE64(x) REPCASE32(x) REPCASE32(x)
-#define REPCASE95(x) REPCASE64(x) REPCASE31(x)
+#define REPCASE87(x) REPCASE64(x) REPCASE23(x)
 #define REPCASE128(x) REPCASE64(x) REPCASE64(x)
 #define REPCASE256(x) REPCASE128(x) REPCASE128(x)
 #define REPCASENX(x,N) REPCASE##N(x)