diff --git a/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/event/events/BotEvents.kt b/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/event/events/BotEvents.kt
index 7e5c728a2..62d3ce631 100644
--- a/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/event/events/BotEvents.kt
+++ b/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/event/events/BotEvents.kt
@@ -12,8 +12,6 @@
 
 package net.mamoe.mirai.event.events
 
-import kotlinx.atomicfu.AtomicBoolean
-import kotlinx.atomicfu.atomic
 import net.mamoe.mirai.Bot
 import net.mamoe.mirai.JavaFriendlyAPI
 import net.mamoe.mirai.contact.*
@@ -22,6 +20,7 @@ import net.mamoe.mirai.event.BroadcastControllable
 import net.mamoe.mirai.event.CancellableEvent
 import net.mamoe.mirai.event.events.ImageUploadEvent.Failed
 import net.mamoe.mirai.event.events.ImageUploadEvent.Succeed
+import net.mamoe.mirai.event.internal.MiraiAtomicBoolean
 import net.mamoe.mirai.message.data.Image
 import net.mamoe.mirai.message.data.MessageChain
 import net.mamoe.mirai.message.data.MessageSource
@@ -31,6 +30,7 @@ import net.mamoe.mirai.utils.MiraiExperimentalAPI
 import net.mamoe.mirai.utils.MiraiInternalAPI
 import net.mamoe.mirai.utils.SinceMirai
 import net.mamoe.mirai.utils.internal.runBlocking
+import kotlin.jvm.JvmField
 import kotlin.jvm.JvmName
 import kotlin.jvm.JvmOverloads
 import kotlin.jvm.JvmSynthetic
@@ -511,7 +511,8 @@ data class NewFriendRequestEvent(
      */
     val fromNick: String
 ) : BotEvent, Packet {
-    internal val responded: AtomicBoolean = atomic(false)
+    @JvmField
+    internal val responded: MiraiAtomicBoolean = MiraiAtomicBoolean(false)
 
     /**
      * @return 申请人来自的群. 当申请人来自其他途径申请时为 `null`
@@ -563,7 +564,8 @@ data class MemberJoinRequestEvent(
 ) : BotEvent, Packet {
     val group: Group = this.bot.getGroup(groupId)
 
-    internal val responded: AtomicBoolean = atomic(false)
+    @JvmField
+    internal val responded: MiraiAtomicBoolean = MiraiAtomicBoolean(false)
 
     @JvmSynthetic
     suspend fun accept() = bot.acceptMemberJoinRequest(this)
diff --git a/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/event/select.kt b/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/event/select.kt
index 30ad31334..1ede4ea3a 100644
--- a/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/event/select.kt
+++ b/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/event/select.kt
@@ -119,6 +119,7 @@ suspend inline fun <reified T : ContactMessage, R> T.selectMessages(
  *
  * @see MessageSelectBuilderUnit 查看上层 API
  */
+@Suppress("PARAMETER_NAME_CHANGED_ON_OVERRIDE")
 @SinceMirai("0.29.0")
 abstract class MessageSelectBuilder<M : ContactMessage, R> @PublishedApi internal constructor(
     ownerMessagePacket: M,
@@ -148,24 +149,16 @@ abstract class MessageSelectBuilder<M : ContactMessage, R> @PublishedApi interna
 
     @JvmName("reply3")
     @Suppress(
-        "INAPPLICABLE_JVM_NAME",
-        "unused",
-        "UNCHECKED_CAST",
-        "INVALID_CHARACTERS",
-        "NAME_CONTAINS_ILLEGAL_CHARS",
-        "FunctionName"
+        "INAPPLICABLE_JVM_NAME", "unused", "UNCHECKED_CAST",
+        "INVALID_CHARACTERS", "NAME_CONTAINS_ILLEGAL_CHARS", "FunctionName"
     )
     @Deprecated("Using `reply` DSL in message selection is prohibited", level = DeprecationLevel.HIDDEN)
     override infix fun MessageSelectionTimeoutChecker.`->`(message: String): Nothing = error("prohibited")
 
     @JvmName("reply3")
     @Suppress(
-        "INAPPLICABLE_JVM_NAME",
-        "unused",
-        "UNCHECKED_CAST",
-        "INVALID_CHARACTERS",
-        "NAME_CONTAINS_ILLEGAL_CHARS",
-        "FunctionName"
+        "INAPPLICABLE_JVM_NAME", "unused", "UNCHECKED_CAST",
+        "INVALID_CHARACTERS", "NAME_CONTAINS_ILLEGAL_CHARS", "FunctionName"
     )
     @Deprecated("Using `reply` DSL in message selection is prohibited", level = DeprecationLevel.HIDDEN)
     override infix fun MessageSelectionTimeoutChecker.`->`(message: Message): Nothing = error("prohibited")
@@ -232,7 +225,7 @@ abstract class MessageSelectBuilder<M : ContactMessage, R> @PublishedApi interna
     override fun ListeningFilter.quoteReply(toReply: String) = error("prohibited")
 
     @Deprecated("Using `reply` DSL in message selection is prohibited", level = DeprecationLevel.HIDDEN)
-    override fun ListeningFilter.quoteReply(message: Message) = error("prohibited")
+    override fun ListeningFilter.quoteReply(toReply: Message) = error("prohibited")
 
     @Deprecated("Using `reply` DSL in message selection is prohibited", level = DeprecationLevel.HIDDEN)
     override fun ListeningFilter.quoteReply(replier: suspend M.(String) -> Any?) = error("prohibited")
@@ -351,12 +344,8 @@ abstract class MessageSelectBuilderUnit<M : ContactMessage, R> @PublishedApi int
 
     @JvmName("reply3")
     @Suppress(
-        "INAPPLICABLE_JVM_NAME",
-        "unused",
-        "UNCHECKED_CAST",
-        "INVALID_CHARACTERS",
-        "NAME_CONTAINS_ILLEGAL_CHARS",
-        "FunctionName"
+        "INAPPLICABLE_JVM_NAME", "unused", "UNCHECKED_CAST",
+        "INVALID_CHARACTERS", "NAME_CONTAINS_ILLEGAL_CHARS", "FunctionName"
     )
     open infix fun MessageSelectionTimeoutChecker.`->`(message: Message) {
         return this.reply(message)
@@ -364,12 +353,8 @@ abstract class MessageSelectBuilderUnit<M : ContactMessage, R> @PublishedApi int
 
     @JvmName("reply3")
     @Suppress(
-        "INAPPLICABLE_JVM_NAME",
-        "unused",
-        "UNCHECKED_CAST",
-        "INVALID_CHARACTERS",
-        "NAME_CONTAINS_ILLEGAL_CHARS",
-        "FunctionName"
+        "INAPPLICABLE_JVM_NAME", "unused", "UNCHECKED_CAST",
+        "INVALID_CHARACTERS", "NAME_CONTAINS_ILLEGAL_CHARS", "FunctionName"
     )
     open infix fun MessageSelectionTimeoutChecker.`->`(message: String) {
         return this.reply(message)