diff --git a/src/process.cpp b/src/process.cpp
index 3d3bd3e7..9a6c9253 100644
--- a/src/process.cpp
+++ b/src/process.cpp
@@ -71,9 +71,9 @@ boost::filesystem::path find_working_directory(const std::string &cmd, bp::envir
 
   BOOST_LOG(debug) << "Parsed executable ["sv << parts.at(0) << "] from command ["sv << cmd << ']';
 
-  // If the cmd path is not a complete path, resolve it using our PATH variable
+  // If the cmd path is not an absolute path, resolve it using our PATH variable
   boost::filesystem::path cmd_path(parts.at(0));
-  if(!cmd_path.is_complete()) {
+  if(!cmd_path.is_absolute()) {
     cmd_path = boost::process::search_path(parts.at(0));
     if(cmd_path.empty()) {
       BOOST_LOG(error) << "Unable to find executable ["sv << parts.at(0) << "]. Is it in your PATH?"sv;
diff --git a/src/round_robin.h b/src/round_robin.h
index a7fe19a1..09c32094 100644
--- a/src/round_robin.h
+++ b/src/round_robin.h
@@ -5,14 +5,15 @@
 
 namespace round_robin_util {
 template<class V, class T>
-class it_wrap_t : public std::iterator<std::random_access_iterator_tag, V> {
+class it_wrap_t {
 public:
+  using iterator_category = std::random_access_iterator_tag;
+  using value_type        = V;
+  using difference_type   = V;
+  using pointer           = V *;
+  using reference         = V &;
+
   typedef T iterator;
-  typedef typename std::iterator<std::random_access_iterator_tag, V>::value_type class_t;
-
-  typedef class_t &reference;
-  typedef class_t *pointer;
-
   typedef std::ptrdiff_t diff_t;
 
   iterator operator+=(diff_t step) {