diff --git a/android/autodispose-android/src/main/java/com/uber/autodispose/android/ViewScopeProvider.java b/android/autodispose-android/src/main/java/com/uber/autodispose/android/ViewScopeProvider.java
index cf5d3f6ef..f9515e56c 100755
--- a/android/autodispose-android/src/main/java/com/uber/autodispose/android/ViewScopeProvider.java
+++ b/android/autodispose-android/src/main/java/com/uber/autodispose/android/ViewScopeProvider.java
@@ -54,7 +54,7 @@ public class ViewScopeProvider implements LifecycleScopeProvider<ViewLifecycleEv
    * @param view the view to scope for
    * @return a {@link LifecycleScopeProvider} against this view.
    */
-  public static LifecycleScopeProvider from(View view) {
+  public static LifecycleScopeProvider<ViewLifecycleEvent> from(View view) {
     if (view == null) {
       throw new NullPointerException("view == null");
     }
diff --git a/autodispose/src/main/java/com/uber/autodispose/ParallelFlowableScoper.java b/autodispose/src/main/java/com/uber/autodispose/ParallelFlowableScoper.java
index 452d722bb..1873f1415 100644
--- a/autodispose/src/main/java/com/uber/autodispose/ParallelFlowableScoper.java
+++ b/autodispose/src/main/java/com/uber/autodispose/ParallelFlowableScoper.java
@@ -36,7 +36,8 @@ static final class AutoDisposeParallelFlowable<T> extends ParallelFlowable<T> {
         return;
       }
 
-      Subscriber<? super T>[] newSubscribers = new Subscriber[subscribers.length];
+      @SuppressWarnings("unchecked") Subscriber<? super T>[] newSubscribers
+          = new Subscriber[subscribers.length];
       for (int i = 0; i < subscribers.length; i++) {
         AutoDisposingSubscriberImpl<? super T> subscriber =
             new AutoDisposingSubscriberImpl<>(scope, subscribers[i]);
diff --git a/sample/src/main/java/com/uber/autodispose/recipes/AutoDisposeActivity.java b/sample/src/main/java/com/uber/autodispose/recipes/AutoDisposeActivity.java
index a0e86e103..798db508a 100644
--- a/sample/src/main/java/com/uber/autodispose/recipes/AutoDisposeActivity.java
+++ b/sample/src/main/java/com/uber/autodispose/recipes/AutoDisposeActivity.java
@@ -77,7 +77,7 @@ public enum ActivityEvent {
     return lifecycleEvents.getValue();
   }
 
-  @Override protected void onCreate(Bundle savedInstanceState) {
+  @Override protected void onCreate(@Nullable Bundle savedInstanceState) {
     super.onCreate(savedInstanceState);
     lifecycleEvents.onNext(ActivityEvent.CREATE);
   }
diff --git a/sample/src/main/java/com/uber/autodispose/recipes/AutoDisposeFragment.java b/sample/src/main/java/com/uber/autodispose/recipes/AutoDisposeFragment.java
index 6f5f58a53..d2d12c608 100644
--- a/sample/src/main/java/com/uber/autodispose/recipes/AutoDisposeFragment.java
+++ b/sample/src/main/java/com/uber/autodispose/recipes/AutoDisposeFragment.java
@@ -92,12 +92,12 @@ public enum FragmentEvent {
     lifecycleEvents.onNext(FragmentEvent.ATTACH);
   }
 
-  @Override public void onCreate(Bundle savedInstanceState) {
+  @Override public void onCreate(@Nullable Bundle savedInstanceState) {
     super.onCreate(savedInstanceState);
     lifecycleEvents.onNext(FragmentEvent.CREATE);
   }
 
-  @Override public void onViewCreated(View view, Bundle savedInstanceState) {
+  @Override public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
     super.onViewCreated(view, savedInstanceState);
     lifecycleEvents.onNext(FragmentEvent.CREATE_VIEW);
   }
diff --git a/static-analysis/autodispose-error-prone-checker/src/main/java/com/uber/autodispose/error/prone/checker/UseAutoDispose.java b/static-analysis/autodispose-error-prone-checker/src/main/java/com/uber/autodispose/error/prone/checker/UseAutoDispose.java
index 0ae2010ee..6310a4593 100644
--- a/static-analysis/autodispose-error-prone-checker/src/main/java/com/uber/autodispose/error/prone/checker/UseAutoDispose.java
+++ b/static-analysis/autodispose-error-prone-checker/src/main/java/com/uber/autodispose/error/prone/checker/UseAutoDispose.java
@@ -150,7 +150,6 @@ public boolean matches(ExpressionTree tree, VisitorState state) {
   private static Matcher<MethodInvocationTree> matcher(List<String> classesWithLifecycle) {
     return (Matcher<MethodInvocationTree>) (tree, state) -> {
 
-      boolean matchFound = false;
       ExpressionTree methodSelectTree = tree.getMethodSelect();
 
       // MemberSelectTree is used only for member access expression.
@@ -164,7 +163,7 @@ private static Matcher<MethodInvocationTree> matcher(List<String> classesWithLif
         return false;
       }
 
-      matchFound = SUBSCRIBE_MATCHERS
+      boolean matchFound = SUBSCRIBE_MATCHERS
           .stream()
           .map(methodNameMatcher -> methodNameMatcher.matches(tree, state))
           .filter(Boolean::booleanValue) // Filtering the method invocation with name subscribe