diff --git a/objectivec/BUILD.bazel b/objectivec/BUILD.bazel
index 0965de5b27..87f1ec04d1 100644
--- a/objectivec/BUILD.bazel
+++ b/objectivec/BUILD.bazel
@@ -45,6 +45,7 @@ genrule(
         for ext in _OBJC_EXTS
     ]),
     exec_tools = ["//:protoc"],
+    tags = ["manual"],
 )
 
 staleness_test(
diff --git a/python/internal.bzl b/python/internal.bzl
index 7441721e9d..8f99becec4 100644
--- a/python/internal.bzl
+++ b/python/internal.bzl
@@ -1,4 +1,12 @@
-# Internal helpers for building the Python protobuf runtime.
+"""
+Internal helpers for building the Python protobuf runtime.
+"""
+
+def _remove_cross_repo_path(path):
+    components = path.split("/")
+    if components[0] == "..":
+        return "/".join(components[2:])
+    return path
 
 def _internal_copy_files_impl(ctx):
     strip_prefix = ctx.attr.strip_prefix
@@ -7,10 +15,11 @@ def _internal_copy_files_impl(ctx):
 
     src_dests = []
     for src in ctx.files.srcs:
-        if src.short_path[:len(strip_prefix)] != strip_prefix:
+        short_path = _remove_cross_repo_path(src.short_path)
+        if short_path[:len(strip_prefix)] != strip_prefix:
             fail("Source does not start with %s: %s" %
-                 (strip_prefix, src.short_path))
-        dest = ctx.actions.declare_file(src.short_path[len(strip_prefix):])
+                 (strip_prefix, short_path))
+        dest = ctx.actions.declare_file(short_path[len(strip_prefix):])
         src_dests.append([src, dest])
 
     if ctx.attr.is_windows: