diff --git a/hooks/lib/check-unittest.sh b/hooks/lib/check-unittest.sh
index 8905571812..efaa025972 100755
--- a/hooks/lib/check-unittest.sh
+++ b/hooks/lib/check-unittest.sh
@@ -24,7 +24,7 @@ fi
 # Unit test failures can't easily be mapped to specific input files.
 # Always run all tests, and report a failure via nonzero exit code if
 # any test fails.
-if ! tox -e py27,scripttests >&2; then
+if ! tox -e py27,scripts >&2; then
   >&2 echo "*** tox failed. Note: If dependencies have changed, try "\
     "running 'tox -r' to update the tox environment"
   exit 1
diff --git a/perfkitbenchmarker/data/run_hpcg.sh b/perfkitbenchmarker/data/run_hpcg.sh
index 0aa4395c99..d003a0e06b 100755
--- a/perfkitbenchmarker/data/run_hpcg.sh
+++ b/perfkitbenchmarker/data/run_hpcg.sh
@@ -1,4 +1,21 @@
 #!/bin/bash
+
+# Copyright 2018 PerfKitBenchmarker Authors. All rights reserved.
+#
+# 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.
+
+
+
 HPCG_DIR=`pwd`
 
 DATETIME=`hostname`.`date +"%Y%m%d.%H%M%S"`
diff --git a/perfkitbenchmarker/linux_benchmarks/cloud_redis_ycsb_benchmark.py b/perfkitbenchmarker/linux_benchmarks/cloud_redis_ycsb_benchmark.py
index 00d033002c..47ee4ede4d 100644
--- a/perfkitbenchmarker/linux_benchmarks/cloud_redis_ycsb_benchmark.py
+++ b/perfkitbenchmarker/linux_benchmarks/cloud_redis_ycsb_benchmark.py
@@ -1,3 +1,16 @@
+# Copyright 2018 PerfKitBenchmarker Authors. All rights reserved.
+#
+# 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.
 """Runs the YCSB benchmark against managed Redis services.
 
 Spins up a cloud redis instance, runs YCSB against it, then spins it down.
diff --git a/perfkitbenchmarker/linux_benchmarks/sample_benchmark.py b/perfkitbenchmarker/linux_benchmarks/sample_benchmark.py
index ce7fa51ca5..a83df9d88b 100644
--- a/perfkitbenchmarker/linux_benchmarks/sample_benchmark.py
+++ b/perfkitbenchmarker/linux_benchmarks/sample_benchmark.py
@@ -1,3 +1,16 @@
+# Copyright 2018 PerfKitBenchmarker Authors. All rights reserved.
+#
+# 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.
 """Sample benchmark.
 
 This benchmark demonstrates the use of preprovisioned data.
diff --git a/perfkitbenchmarker/linux_packages/ch_block_storage.py b/perfkitbenchmarker/linux_packages/ch_block_storage.py
old mode 100755
new mode 100644
diff --git a/perfkitbenchmarker/linux_packages/php.py b/perfkitbenchmarker/linux_packages/php.py
old mode 100755
new mode 100644
diff --git a/perfkitbenchmarker/pkb.py b/perfkitbenchmarker/pkb.py
old mode 100755
new mode 100644
diff --git a/perfkitbenchmarker/scripts/database_scripts/plot_scatter_points.py b/perfkitbenchmarker/scripts/database_scripts/plot_scatter_points.py
index ac1eab44b1..e944154d69 100755
--- a/perfkitbenchmarker/scripts/database_scripts/plot_scatter_points.py
+++ b/perfkitbenchmarker/scripts/database_scripts/plot_scatter_points.py
@@ -1,4 +1,5 @@
 #!/usr/bin/env python
+
 # Copyright 2017 PerfKitBenchmarker Authors. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/perfkitbenchmarker/scripts/database_scripts/plot_sysbench_results.py b/perfkitbenchmarker/scripts/database_scripts/plot_sysbench_results.py
old mode 100644
new mode 100755
diff --git a/tools/SeparateLogFileRuns.py b/tools/SeparateLogFileRuns.py
old mode 100644
new mode 100755