diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/home/ShortNotePostViewModel.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/home/ShortNotePostViewModel.kt
index e9f106d47..b4fb5ff27 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/home/ShortNotePostViewModel.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/home/ShortNotePostViewModel.kt
@@ -602,7 +602,7 @@ open class ShortNotePostViewModel :
             pollOptions[index] = tag
         }
 
-        pollType = draftEvent.pollType() ?: PollType.SINGLE_CHOICE
+        pollType = draftEvent.pollType()
         closedAt = draftEvent.endsAt() ?: TimeUtils.oneDayAhead()
 
         message = TextFieldValue(draftEvent.content)
diff --git a/quartz/src/jvmAndroidTest/kotlin/com/vitorpamplona/quartz/nip77Negentropy/Nip77SerializationTest.kt b/quartz/src/jvmAndroidTest/kotlin/com/vitorpamplona/quartz/nip77Negentropy/Nip77SerializationTest.kt
index 48efb19ad..8b3bce89b 100644
--- a/quartz/src/jvmAndroidTest/kotlin/com/vitorpamplona/quartz/nip77Negentropy/Nip77SerializationTest.kt
+++ b/quartz/src/jvmAndroidTest/kotlin/com/vitorpamplona/quartz/nip77Negentropy/Nip77SerializationTest.kt
@@ -73,7 +73,7 @@ class Nip77SerializationTest {
         val kotlinJson = KotlinSerializationMapper.toJson(msg)
         val jacksonDeserialized = JacksonMapper.fromJsonToMessage(kotlinJson)
         assertTrue(jacksonDeserialized is NegMsgMessage)
-        assertEquals(msg.subId, (jacksonDeserialized as NegMsgMessage).subId)
+        assertEquals(msg.subId, jacksonDeserialized.subId)
         assertEquals(msg.message, jacksonDeserialized.message)
     }
 
@@ -116,12 +116,12 @@ class Nip77SerializationTest {
         val jacksonJson = JacksonMapper.toJson(msg)
         val kotlinDeserialized = KotlinSerializationMapper.fromJsonToMessage(jacksonJson)
         assertTrue(kotlinDeserialized is NegErrMessage)
-        assertEquals(msg.reason, (kotlinDeserialized as NegErrMessage).reason)
+        assertEquals(msg.reason, kotlinDeserialized.reason)
 
         val kotlinJson = KotlinSerializationMapper.toJson(msg)
         val jacksonDeserialized = JacksonMapper.fromJsonToMessage(kotlinJson)
         assertTrue(jacksonDeserialized is NegErrMessage)
-        assertEquals(msg.reason, (jacksonDeserialized as NegErrMessage).reason)
+        assertEquals(msg.reason, jacksonDeserialized.reason)
     }
 
     // =========================================================================
@@ -174,7 +174,7 @@ class Nip77SerializationTest {
         val kotlinJson = KotlinSerializationMapper.toJson(cmd)
         val jacksonDeserialized = JacksonMapper.fromJsonToCommand(kotlinJson)
         assertTrue(jacksonDeserialized is NegOpenCmd)
-        assertEquals(cmd.subId, (jacksonDeserialized as NegOpenCmd).subId)
+        assertEquals(cmd.subId, jacksonDeserialized.subId)
         assertEquals(cmd.initialMessage, jacksonDeserialized.initialMessage)
     }