diff --git a/src/main/java/rx/Scheduler.java b/src/main/java/rx/Scheduler.java
index f1b8a0e28a..756963e66f 100644
--- a/src/main/java/rx/Scheduler.java
+++ b/src/main/java/rx/Scheduler.java
@@ -256,6 +256,7 @@ public long now() {
 	 * @param combine
 	 * @return
 	 */
+    @SuppressWarnings("unchecked")
     @Experimental
 	public <S extends Scheduler & Subscription> S when(Func1<Observable<Observable<Completable>>, Completable> combine) {
 		return (S) new SchedulerWhen(combine, this);
diff --git a/src/main/java/rx/internal/schedulers/GenericScheduledExecutorServiceFactory.java b/src/main/java/rx/internal/schedulers/GenericScheduledExecutorServiceFactory.java
index c0ea18061b..ce4dd8b5b2 100644
--- a/src/main/java/rx/internal/schedulers/GenericScheduledExecutorServiceFactory.java
+++ b/src/main/java/rx/internal/schedulers/GenericScheduledExecutorServiceFactory.java
@@ -1,3 +1,19 @@
+/**
+ * Copyright 2016 Netflix, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package rx.internal.schedulers;
 
 import java.util.concurrent.*;
diff --git a/src/test/java/rx/internal/producers/SingleDelayedProducerTest.java b/src/test/java/rx/internal/producers/SingleDelayedProducerTest.java
index d40387b360..9411b9909e 100644
--- a/src/test/java/rx/internal/producers/SingleDelayedProducerTest.java
+++ b/src/test/java/rx/internal/producers/SingleDelayedProducerTest.java
@@ -1,3 +1,19 @@
+/**
+ * Copyright 2016 Netflix, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package rx.internal.producers;
 
 import java.util.concurrent.*;
diff --git a/src/test/java/rx/internal/producers/SingleProducerTest.java b/src/test/java/rx/internal/producers/SingleProducerTest.java
index faac28ba4d..48cda1ef16 100644
--- a/src/test/java/rx/internal/producers/SingleProducerTest.java
+++ b/src/test/java/rx/internal/producers/SingleProducerTest.java
@@ -1,3 +1,19 @@
+/**
+ * Copyright 2016 Netflix, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package rx.internal.producers;
 
 import org.junit.*;
diff --git a/src/test/java/rx/schedulers/GenericScheduledExecutorServiceTest.java b/src/test/java/rx/schedulers/GenericScheduledExecutorServiceTest.java
index 6a92227bf5..93303ce87d 100644
--- a/src/test/java/rx/schedulers/GenericScheduledExecutorServiceTest.java
+++ b/src/test/java/rx/schedulers/GenericScheduledExecutorServiceTest.java
@@ -1,3 +1,19 @@
+/**
+ * Copyright 2016 Netflix, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package rx.schedulers;
 
 import java.util.concurrent.*;