diff --git a/bridge/src/main/java/com/livefront/bridge/BridgeDelegate.java b/bridge/src/main/java/com/livefront/bridge/BridgeDelegate.java
index 70fcca5..0a892d1 100644
--- a/bridge/src/main/java/com/livefront/bridge/BridgeDelegate.java
+++ b/bridge/src/main/java/com/livefront/bridge/BridgeDelegate.java
@@ -149,7 +149,8 @@ private boolean isAppInForeground() {
     /**
      * If it's a fresh start, we can safely clear cache
      */
-    private boolean isFreshStart(@NonNull Activity activity, @NonNull Bundle savedInstanceState) {
+    private boolean isFreshStart(@NonNull Activity activity,
+                                 @Nullable Bundle savedInstanceState) {
         if (!mIsFirstCreateCall) {
             return false;
         }
@@ -157,7 +158,8 @@ private boolean isFreshStart(@NonNull Activity activity, @NonNull Bundle savedIn
         if (savedInstanceState != null) {
             return false;
         }
-        ActivityManager activityManager = (ActivityManager) activity.getSystemService(Context.ACTIVITY_SERVICE);
+        ActivityManager activityManager =
+                (ActivityManager) activity.getSystemService(Context.ACTIVITY_SERVICE);
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
             List<ActivityManager.AppTask> appTasks = activityManager.getAppTasks();
             return appTasks.size() == 1 && appTasks.get(0).getTaskInfo().numActivities == 1;
diff --git a/bridgesample/src/main/AndroidManifest.xml b/bridgesample/src/main/AndroidManifest.xml
index fbb023a..55d78db 100644
--- a/bridgesample/src/main/AndroidManifest.xml
+++ b/bridgesample/src/main/AndroidManifest.xml
@@ -39,7 +39,7 @@
 
                 <data
                     android:host="large-data-activity"
-                    android:scheme="http" />
+                    android:scheme="bridgesample" />
             </intent-filter>
         </activity>
 
@@ -53,7 +53,7 @@
 
                 <data
                     android:host="success-activity"
-                    android:scheme="http" />
+                    android:scheme="bridgesample" />
             </intent-filter>
         </activity>
 
@@ -67,7 +67,7 @@
 
                 <data
                     android:host="deeplink-activity"
-                    android:scheme="http" />
+                    android:scheme="bridgesample" />
             </intent-filter>
         </activity>