diff --git a/bindings/ruby/fdb.gemspec.cmake b/bindings/ruby/fdb.gemspec.cmake
index bc32a59622..d73b8bac9b 100644
--- a/bindings/ruby/fdb.gemspec.cmake
+++ b/bindings/ruby/fdb.gemspec.cmake
@@ -15,8 +15,8 @@ EOF
   s.email = 'fdb-dist@apple.com'
   s.files = ["${CMAKE_SOURCE_DIR}/LICENSE", "${CMAKE_CURRENT_SOURCE_DIR}/lib/fdb.rb", "${CMAKE_CURRENT_SOURCE_DIR}/lib/fdbdirectory.rb", "${CMAKE_CURRENT_SOURCE_DIR}/lib/fdbimpl.rb", "${CMAKE_CURRENT_SOURCE_DIR}/lib/fdblocality.rb", "${CMAKE_CURRENT_SOURCE_DIR}/lib/fdboptions.rb", "${CMAKE_CURRENT_SOURCE_DIR}/lib/fdbsubspace.rb", "${CMAKE_CURRENT_SOURCE_DIR}/lib/fdbtuple.rb", "${CMAKE_CURRENT_SOURCE_DIR}/lib/fdbimpl_v609.rb"]
   s.homepage = 'https://www.foundationdb.org'
-  s.license = 'Apache v2'
-  s.add_dependency('ffi', '>= 1.1.5')
+  s.license = 'Apache-2.0'
+  s.add_dependency('ffi', '~> 1.1', '>= 1.1.5')
   s.required_ruby_version = '>= 1.9.3'
   s.requirements << 'These bindings require the FoundationDB client. The client can be obtained from https://www.foundationdb.org/download/.'
 end
diff --git a/bindings/ruby/fdb.gemspec.in b/bindings/ruby/fdb.gemspec.in
index 4e73e3e5e0..092bc2eacd 100644
--- a/bindings/ruby/fdb.gemspec.in
+++ b/bindings/ruby/fdb.gemspec.in
@@ -15,8 +15,8 @@ EOF
   s.email = 'fdb-dist@apple.com'
   s.files = ["LICENSE", "lib/fdb.rb", "lib/fdbdirectory.rb", "lib/fdbimpl.rb", "lib/fdblocality.rb", "lib/fdboptions.rb", "lib/fdbsubspace.rb", "lib/fdbtuple.rb", "lib/fdbimpl_v609.rb"]
   s.homepage = 'https://www.foundationdb.org'
-  s.license = 'Apache v2'
-  s.add_dependency('ffi', '>= 1.1.5')
+  s.license = 'Apache-2.0'
+  s.add_dependency('ffi', '~> 1.1', '>= 1.1.5')
   s.required_ruby_version = '>= 1.9.3'
   s.requirements << 'These bindings require the FoundationDB client. The client can be obtained from https://www.foundationdb.org/download/.'
 end
diff --git a/flow/CMakeLists.txt b/flow/CMakeLists.txt
index 61ce9ed17b..c18285832d 100644
--- a/flow/CMakeLists.txt
+++ b/flow/CMakeLists.txt
@@ -75,7 +75,6 @@ set(FLOW_SRCS
   flat_buffers.h
   flow.cpp
   flow.h
-  folly_memcpy.S
   genericactors.actor.cpp
   genericactors.actor.h
   network.cpp
@@ -89,6 +88,10 @@ set(FLOW_SRCS
   test_memcpy_perf.cpp
   version.cpp)
 
+if(UNIX AND NOT APPLE)
+  list(APPEND FLOW_SRCS folly_memcpy.S)
+endif()
+
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/SourceVersion.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/SourceVersion.h)
 
 add_flow_target(STATIC_LIBRARY NAME flow SRCS ${FLOW_SRCS})