diff --git a/src/objective-c/examples/RemoteTestClient/RemoteTest.podspec b/src/objective-c/examples/RemoteTestClient/RemoteTest.podspec
index fbc37317ba1..747df63ac5b 100644
--- a/src/objective-c/examples/RemoteTestClient/RemoteTest.podspec
+++ b/src/objective-c/examples/RemoteTestClient/RemoteTest.podspec
@@ -45,20 +45,20 @@ Pod::Spec.new do |s|
   end
 
   s.subspec 'Messages' do |ms|
-    ms.source_files = '**/*.pbobjc.{h,m}'
+    ms.source_files = 'src/objective-c/examples/RemoteTestClient/*.pbobjc.{h,m}'
     ms.header_mappings_dir = '.'
     ms.requires_arc = false
     ms.dependency 'Protobuf'
   end
 
   s.subspec 'Services' do |ss|
-    ss.source_files = '**/*.pbrpc.{h,m}'
+    ss.source_files = 'src/objective-c/examples/RemoteTestClient/*.pbrpc.{h,m}'
     ss.header_mappings_dir = '.'
     ss.requires_arc = true
     ss.dependency 'gRPC-ProtoRPC'
     ss.dependency "#{s.name}/Messages"
   end
-  
+
   s.pod_target_xcconfig = {
     # This is needed by all pods that depend on Protobuf:
     'GCC_PREPROCESSOR_DEFINITIONS' => '$(inherited) GPB_USE_PROTOBUF_FRAMEWORK_IMPORTS=1',
diff --git a/src/objective-c/examples/SwiftSample/Images.xcassets/AppIcon.appiconset/Contents.json b/src/objective-c/examples/SwiftSample/Images.xcassets/AppIcon.appiconset/Contents.json
index d8db8d65fd7..36d2c80d889 100644
--- a/src/objective-c/examples/SwiftSample/Images.xcassets/AppIcon.appiconset/Contents.json
+++ b/src/objective-c/examples/SwiftSample/Images.xcassets/AppIcon.appiconset/Contents.json
@@ -1,15 +1,5 @@
 {
   "images" : [
-    {
-      "idiom" : "iphone",
-      "size" : "20x20",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "iphone",
-      "size" : "20x20",
-      "scale" : "3x"
-    },
     {
       "idiom" : "iphone",
       "size" : "29x29",
@@ -40,16 +30,6 @@
       "size" : "60x60",
       "scale" : "3x"
     },
-    {
-      "idiom" : "ipad",
-      "size" : "20x20",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "ipad",
-      "size" : "20x20",
-      "scale" : "2x"
-    },
     {
       "idiom" : "ipad",
       "size" : "29x29",
@@ -79,16 +59,6 @@
       "idiom" : "ipad",
       "size" : "76x76",
       "scale" : "2x"
-    },
-    {
-      "idiom" : "ipad",
-      "size" : "83.5x83.5",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "ios-marketing",
-      "size" : "1024x1024",
-      "scale" : "1x"
     }
   ],
   "info" : {
diff --git a/src/objective-c/tests/RemoteTestClient/RemoteTest.podspec b/src/objective-c/tests/RemoteTestClient/RemoteTest.podspec
index 60727d4d94e..27b7fab069f 100644
--- a/src/objective-c/tests/RemoteTestClient/RemoteTest.podspec
+++ b/src/objective-c/tests/RemoteTestClient/RemoteTest.podspec
@@ -45,14 +45,14 @@ Pod::Spec.new do |s|
   CMD
 
   s.subspec "Messages" do |ms|
-    ms.source_files = "**/*.pbobjc.{h,m}"
+    ms.source_files = "src/objective-c/tests/RemoteTestClient/*.pbobjc.{h,m}"
     ms.header_mappings_dir = "."
     ms.requires_arc = false
     ms.dependency "Protobuf"
   end
 
   s.subspec "Services" do |ss|
-    ss.source_files = "**/*.pbrpc.{h,m}"
+    ss.source_files = "src/objective-c/tests/RemoteTestClient/*.pbrpc.{h,m}"
     ss.header_mappings_dir = "."
     ss.requires_arc = true
     ss.dependency "gRPC-ProtoRPC"
diff --git a/tools/internal_ci/helper_scripts/prepare_build_macos_rc b/tools/internal_ci/helper_scripts/prepare_build_macos_rc
index 009cc067578..e2f52e73117 100644
--- a/tools/internal_ci/helper_scripts/prepare_build_macos_rc
+++ b/tools/internal_ci/helper_scripts/prepare_build_macos_rc
@@ -37,7 +37,7 @@ set -e  # rvm commands are very verbose
 time rvm install 2.5.0
 rvm use 2.5.0 --default
 time gem install bundler -v 1.17.3 --no-ri --no-doc
-time gem install cocoapods --version 1.6.1 --no-ri --no-doc
+time gem install cocoapods --version 1.3.1 --no-ri --no-doc
 time gem install rake-compiler --no-ri --no-doc
 rvm osx-ssl-certs status all
 rvm osx-ssl-certs update all