diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake
index cfce7aa55acaefccf46e9c89c1aabd40f78e0d2f..64c747de39d70b0b5ed0f5a939882ec810dbff9a 100644
--- a/indra/cmake/00-Common.cmake
+++ b/indra/cmake/00-Common.cmake
@@ -287,7 +287,7 @@ if (DARWIN)
   add_definitions(-DLL_DARWIN=1 -DGL_SILENCE_DEPRECATION)
   set(CMAKE_CXX_LINK_FLAGS "-Wl,-headerpad_max_install_names,-search_paths_first")
   set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_CXX_LINK_FLAGS}")
-  set(DARWIN_extra_cstar_flags "-gdwarf-2 -fobjc-arc -fno-strict-aliasing")
+  set(DARWIN_extra_cstar_flags "-gdwarf-2 -fobjc-arc -fno-strict-aliasing -faligned-allocation")
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${DARWIN_extra_cstar_flags}")
   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}  ${DARWIN_extra_cstar_flags}")
   # NOTE: it's critical that the optimization flag is put in front.
@@ -302,10 +302,6 @@ if (DARWIN)
     set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O3 ${CMAKE_C_FLAGS_RELWITHDEBINFO}")
     set(CMAKE_CXX_FLAGS_RELEASE "-Ofast -ffast-math -mavx -mprefer-vector-width=128 ${CMAKE_CXX_FLAGS_RELEASE}")
     set(CMAKE_C_FLAGS_RELEASE "-Ofast -ffast-math -mavx -mprefer-vector-width=128 ${CMAKE_C_FLAGS_RELEASE}")
-    if(USE_LTO)
-      set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -fforce-emit-vtables -fwhole-program-vtables")
-      set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -fforce-emit-vtables -fwhole-program-vtables")
-    endif()
   endif()
 endif (DARWIN)
 
diff --git a/indra/cmake/Variables.cmake b/indra/cmake/Variables.cmake
index 5402cb518d52682d0957b6249c331a64707ef067..ee75668a69983c429580475af7358fdd8cbb612b 100644
--- a/indra/cmake/Variables.cmake
+++ b/indra/cmake/Variables.cmake
@@ -206,8 +206,8 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
   if (XCODE_VERSION LESS 10.2.0)
     message( FATAL_ERROR "Xcode 10.2.0 or greater is required." )
   endif (XCODE_VERSION LESS 10.2.0)
-    message( "Building with " ${CMAKE_OSX_SYSROOT} )
-  set(CMAKE_OSX_DEPLOYMENT_TARGET 10.14)
+  message( "Building with " ${CMAKE_OSX_SYSROOT} )
+  set(CMAKE_OSX_DEPLOYMENT_TARGET 10.13)
 
   set(CMAKE_XCODE_GENERATE_SCHEME ON)
   if (USE_ASAN)