diff --git a/lonestar/analytics/cpu/bipart/Coarsening.cpp b/lonestar/analytics/cpu/bipart/Coarsening.cpp
index 96d17671dd..ade2692b17 100644
--- a/lonestar/analytics/cpu/bipart/Coarsening.cpp
+++ b/lonestar/analytics/cpu/bipart/Coarsening.cpp
@@ -49,7 +49,7 @@ void parallelRand(MetisGraph* graph, int) {
   T_RAND.start();
 
 	galois::do_all(
-      galois::iterate((uint64_t) 0, fineGGraph->hedges),
+      galois::iterate((size_t) 0, fineGGraph->hedges),
       [&fineGGraph](uint64_t item) {
 				unsigned netnum = fineGGraph->getData(item, flag_no_lock).netnum;
 				netnum= hash(netnum);
@@ -65,7 +65,7 @@ void parallelRand(MetisGraph* graph, int) {
 		galois::StatTimer T_INDEX("INDEX");
   	T_INDEX.start();
 		galois::do_all(
-      galois::iterate((uint64_t) 0, fineGGraph->hedges),
+      galois::iterate((size_t) 0, fineGGraph->hedges),
       [&fineGGraph](uint64_t item) {
         unsigned netnum = fineGGraph->getData(item, flag_no_lock).index;
         netnum= hash(1);
@@ -385,14 +385,14 @@ void coarsePhaseII(MetisGraph* graph, std::vector<bool>& hedges,
 void findLoneNodes(GGraph& graph){
 	
 	galois::do_all(
-		galois::iterate((uint64_t) graph.hedges, graph.size()),
+		galois::iterate(graph.hedges, graph.size()),
 			[&](GNode n){
 				
 				graph.getData(n).notAlone = false;
 			}, galois::steal(), galois::loopname("initialize not alone variables"));
 	
 	galois::do_all(
-		galois::iterate((uint64_t) 0, graph.hedges),
+		galois::iterate((size_t) 0, graph.hedges),
 			[&](GNode h){
 
 				for(auto n:graph.edges(h))
diff --git a/lonestar/analytics/cpu/bipart/bipart.cpp b/lonestar/analytics/cpu/bipart/bipart.cpp
index 27761209ea..203bd04f4b 100644
--- a/lonestar/analytics/cpu/bipart/bipart.cpp
+++ b/lonestar/analytics/cpu/bipart/bipart.cpp
@@ -312,7 +312,7 @@ int main(int argc, char** argv) {
   kValue[(k + 1) / 2] = k / 2;
 
   galois::do_all(
-      galois::iterate((uint64_t)graph.hedges, graph.size()),
+      galois::iterate(graph.hedges, graph.size()),
       [&](GNode n) {
         unsigned pp = graph.getData(n).getPart();
         if (pp == 1) {
@@ -348,7 +348,7 @@ int main(int argc, char** argv) {
 
     // distribute hyperedges according to their current partition
     galois::do_all(
-        galois::iterate((uint64_t)0, graph.hedges),
+        galois::iterate((size_t)0, graph.hedges),
         [&](GNode h) {
           auto edge = *(graph.edges(h).begin());
           auto dst  = graph.getEdgeDst(edge);
diff --git a/lonestar/scientific/cpu/longestedge/test/catch.hpp b/lonestar/scientific/cpu/longestedge/test/catch.hpp
index 6c1756a6ce..3b99915111 100644
--- a/lonestar/scientific/cpu/longestedge/test/catch.hpp
+++ b/lonestar/scientific/cpu/longestedge/test/catch.hpp
@@ -7859,7 +7859,11 @@ namespace Catch {
 
 #ifdef CATCH_PLATFORM_MAC
 
-    #define CATCH_TRAP() __asm__("int $3\n" : : ) /* NOLINT */
+    #if defined(__i386__) || defined(__x86_64__)
+        #define CATCH_TRAP() __asm__("int $3\n" : : ) /* NOLINT */
+    #elif defined(__aarch64__)
+        #define CATCH_TRAP()  __asm__(".inst 0xd4200000")
+    #endif
 
 #elif defined(CATCH_PLATFORM_IPHONE)