diff --git a/bench/micro/micro_boolean_addition.cpp b/bench/micro/micro_boolean_addition.cpp
index 640982db..6d754c2c 100644
--- a/bench/micro/micro_boolean_addition.cpp
+++ b/bench/micro/micro_boolean_addition.cpp
@@ -21,7 +21,7 @@ int main(int argc, char** argv) {
     double elapsed;
     gettimeofday(&begin, 0);
 
-    BSharedVector<int> c_1 = orq::ripple_carry_adder(a, b);
+    BSharedVector<int> c_1 = orq::operators::ripple_carry_adder(a, b);
 
     // stop timer
     gettimeofday(&end, 0);
@@ -34,7 +34,7 @@ int main(int argc, char** argv) {
 
     gettimeofday(&begin, 0);
 
-    BSharedVector<int> c_2 = orq::parallel_prefix_adder(a, b);
+    BSharedVector<int> c_2 = orq::operators::parallel_prefix_adder(a, b);
 
     gettimeofday(&end, 0);
     seconds = end.tv_sec - begin.tv_sec;
diff --git a/bench/micro/micro_ccs_radix.cpp b/bench/micro/micro_ccs_radix.cpp
index c64c9b6e..b30b27d0 100644
--- a/bench/micro/micro_ccs_radix.cpp
+++ b/bench/micro/micro_ccs_radix.cpp
@@ -10,8 +10,6 @@ using namespace COMPILED_MPC_PROTOCOL_NAMESPACE;
 #define MAX_ROW_EXPONENT 20
 
 int main(int argc, char** argv) {
-     [executable - threads_num - p_factor -
-    // batch_size]
     orq_init(argc, argv);
     auto pID = runTime->getPartyID();
     int test_size = 1 << 20;
diff --git a/bench/micro/micro_sorting_rs.cpp b/bench/micro/micro_sorting_rs.cpp
index 9d024727..1a8d53cb 100644
--- a/bench/micro/micro_sorting_rs.cpp
+++ b/bench/micro/micro_sorting_rs.cpp
@@ -16,8 +16,6 @@ using T = int32_t;
 #endif
 
 int main(int argc, char** argv) {
-     [executable - threads_num - p_factor -
-    // batch_size]
     orq_init(argc, argv);
     auto pID = runTime->getPartyID();
     int test_size = 1 << 20;
diff --git a/examples/ex5_join.cpp b/examples/ex5_join.cpp
index 4a7c955d..ef82ddc8 100644
--- a/examples/ex5_join.cpp
+++ b/examples/ex5_join.cpp
@@ -109,7 +109,7 @@ int main(int argc, char **argv) {
         Joined.addColumn("Count");
 
         auto StudentCount = Joined.deepcopy();
-        StudentCount.sort({ENC_TABLE_VALID, "[StudentID]"});
+        StudentCount.sort(std::vector<std::string>{ENC_TABLE_VALID, "[StudentID]"});
         StudentCount.distinct({"[StudentID]"});
         // Count the students
         StudentCount.aggregate({ENC_TABLE_VALID}, {{"Count", "Count", count<A>}});
@@ -151,7 +151,7 @@ int main(int argc, char **argv) {
     {
         auto Joined = Attendees.left_outer_join(Classes, {"[StudentID]"});
 
-        Joined.sort({ENC_TABLE_VALID, "[StudentID]"});
+        Joined.sort(std::vector<std::string>{ENC_TABLE_VALID, "[StudentID]"});
         Joined.distinct({"[StudentID]"});
 
         auto opened = Joined.open_with_schema().first;
@@ -170,7 +170,7 @@ int main(int argc, char **argv) {
         auto Joined = Attendees.right_outer_join(Classes, {"[StudentID]"});
 
         // distinct requires a sort first
-        Joined.sort({ENC_TABLE_VALID, "[StudentID]"});
+        Joined.sort(std::vector<std::string>{ENC_TABLE_VALID, "[StudentID]"});
         Joined.distinct({"[StudentID]"});
 
         auto opened = Joined.open_with_schema().first;
@@ -187,7 +187,7 @@ int main(int argc, char **argv) {
     {
         auto Joined = Attendees.full_outer_join(Classes, {"[StudentID]"});
 
-        Joined.sort({ENC_TABLE_VALID, "[StudentID]"});
+        Joined.sort(std::vector<std::string>{ENC_TABLE_VALID, "[StudentID]"});
         Joined.distinct({"[StudentID]"});
 
         auto opened = Joined.open_with_schema().first;
@@ -208,7 +208,7 @@ int main(int argc, char **argv) {
     {
         auto Joined = Classes.anti_join(Attendees, {"[StudentID]"});
 
-        Joined.sort({ENC_TABLE_VALID, "[StudentID]"});
+        Joined.sort(std::vector<std::string>{ENC_TABLE_VALID, "[StudentID]"});
         Joined.distinct({"[StudentID]"});
 
         auto opened = Joined.open_with_schema().first;
@@ -230,10 +230,10 @@ int main(int argc, char **argv) {
     {
         auto Joined = Classes.semi_join(Attendees, {"[StudentID]"});
 
-        Joined.sort({ENC_TABLE_VALID, "[CourseID]"});
+        Joined.sort(std::vector<std::string>{ENC_TABLE_VALID, "[CourseID]"});
         Joined.distinct({"[CourseID]"});
 
-        Classes.sort({ENC_TABLE_VALID, "[CourseID]"});
+        Classes.sort(std::vector<std::string>{ENC_TABLE_VALID, "[CourseID]"});
         Classes.distinct({"[CourseID]"});
         auto c_count = Classes.open_with_schema().first[0].size();