diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6cf672a..cf0bbdd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,7 +6,7 @@ find_package(Dyninst 13.0.0 REQUIRED COMPONENTS dyninstAPI dynC_API parseAPI
 
 add_executable(InterestingProgram common/mutatees/InterestingProgram.cpp)
 
-set(EXAMPLES_WARNING_FLAGS -Wall -Wextra)
+set(EXAMPLES_WARNING_FLAGS -Wall -Wextra -Wpedantic -Werror)
 
 add_subdirectory(CFGraph)
 add_subdirectory(codeCoverage)
diff --git a/instructionAPI/statefull_visitor.cpp b/instructionAPI/statefull_visitor.cpp
index d7de45e..089c038 100644
--- a/instructionAPI/statefull_visitor.cpp
+++ b/instructionAPI/statefull_visitor.cpp
@@ -54,11 +54,9 @@ struct stateful_visitor : di::Visitor {
 
 void print(di::Instruction const& insn) {
   stateful_visitor v;
-  std::vector<di::Operand> operands;
-  insn.getOperands(operands);
 
   std::cout << "instruction: " << insn.format() << '\n';
-  for(auto const& o : operands) {
+  for(auto const& o : insn.getAllOperands()) {
     std::cout << "operand '" << o.format(insn.getArch()) << "'\n";
     o.getValue()->apply(&v);
     std::cout << v << '\n';
diff --git a/instructionAPI/stateless_visitor.cpp b/instructionAPI/stateless_visitor.cpp
index 6ca80e0..b483a9d 100644
--- a/instructionAPI/stateless_visitor.cpp
+++ b/instructionAPI/stateless_visitor.cpp
@@ -48,12 +48,10 @@ class printer : public di::Visitor {
 
 void print(di::Instruction const& insn) {
   printer pv;
-  std::vector<di::Operand> operands;
-  insn.getOperands(operands);
 
   std::cout << "instruction: " << insn.format() << '\n';
   int op_num = 1;
-  for(auto const& o : operands) {
+  for(auto const& o : insn.getAllOperands()) {
     std::cout << "operand" << op_num << " '" << o.format(insn.getArch()) << "'\n";
     o.getValue()->apply(&pv);
     op_num++;