diff --git a/database/app/src/main/java/com/google/firebase/quickstart/database/EntryChoiceActivity.kt b/database/app/src/main/java/com/google/firebase/quickstart/database/EntryChoiceActivity.kt
index da957ffaf..0ebb2112b 100644
--- a/database/app/src/main/java/com/google/firebase/quickstart/database/EntryChoiceActivity.kt
+++ b/database/app/src/main/java/com/google/firebase/quickstart/database/EntryChoiceActivity.kt
@@ -11,11 +11,11 @@ class EntryChoiceActivity : BaseEntryChoiceActivity() {
                 Choice(
                         "Java",
                         "Run the Firebase Realtime Database quickstart written in Java.",
-                        Intent(this, com.google.firebase.quickstart.database.java.MainActivity::class.java)),
+                        Intent(this, com.google.firebase.quickstart.database.java.SignInActivity::class.java)),
                 Choice(
                         "Kotlin",
                         "Run the Firebase Realtime Database quickstart written in Kotlin.",
-                        Intent(this, com.google.firebase.quickstart.database.kotlin.MainActivity::class.java))
+                        Intent(this, com.google.firebase.quickstart.database.kotlin.SignInActivity::class.java))
         )
     }
 }
diff --git a/database/app/src/main/java/com/google/firebase/quickstart/database/java/fragment/PostListFragment.java b/database/app/src/main/java/com/google/firebase/quickstart/database/java/fragment/PostListFragment.java
index 8079a32e9..d79cdb93d 100644
--- a/database/app/src/main/java/com/google/firebase/quickstart/database/java/fragment/PostListFragment.java
+++ b/database/app/src/main/java/com/google/firebase/quickstart/database/java/fragment/PostListFragment.java
@@ -173,7 +173,6 @@ public void onStop() {
         }
     }
 
-
     public String getUid() {
         return FirebaseAuth.getInstance().getCurrentUser().getUid();
     }
diff --git a/database/app/src/main/java/com/google/firebase/quickstart/database/kotlin/fragment/PostListFragment.kt b/database/app/src/main/java/com/google/firebase/quickstart/database/kotlin/fragment/PostListFragment.kt
index 49cc3dfa8..8d11ce575 100644
--- a/database/app/src/main/java/com/google/firebase/quickstart/database/kotlin/fragment/PostListFragment.kt
+++ b/database/app/src/main/java/com/google/firebase/quickstart/database/kotlin/fragment/PostListFragment.kt
@@ -50,6 +50,7 @@ abstract class PostListFragment : Fragment() {
         database = FirebaseDatabase.getInstance().reference
         // [END create_database_reference]
 
+        recycler = rootView.findViewById(R.id.messagesList)
         rootView.messagesList.setHasFixedSize(true)
 
         return rootView