diff --git a/trunk-recorder/gr_blocks/pwr_squelch_cc_impl.h b/trunk-recorder/gr_blocks/pwr_squelch_cc_impl.h
index 96ee353a..ef9e0a1a 100644
--- a/trunk-recorder/gr_blocks/pwr_squelch_cc_impl.h
+++ b/trunk-recorder/gr_blocks/pwr_squelch_cc_impl.h
@@ -41,7 +41,7 @@ class ANALOG_API pwr_squelch_cc_impl : public pwr_squelch_cc, squelch_base_cc_im
 
     double threshold() const override { return 10 * log10(d_threshold); }
     void set_threshold(double db) override;
-    double get_pwr() ;
+    double get_pwr() override;
     void set_alpha(double alpha) override;
 
     int ramp() const override { return squelch_base_cc_impl::ramp(); }
diff --git a/trunk-recorder/systems/system.h b/trunk-recorder/systems/system.h
index 2ae4dc75..cf23f5ce 100644
--- a/trunk-recorder/systems/system.h
+++ b/trunk-recorder/systems/system.h
@@ -175,6 +175,7 @@ class System {
   virtual void update_active_talkgroup_patches(PatchData f_data) = 0;
   virtual void delete_talkgroup_patch(PatchData f_data) = 0;
   virtual void clear_stale_talkgroup_patches() = 0;
+  virtual void print_active_talkgroup_patches() = 0;
 
   virtual bool get_multiSite() = 0;
   virtual void set_multiSite(bool multiSite) = 0;
diff --git a/trunk-recorder/systems/system_impl.h b/trunk-recorder/systems/system_impl.h
index 2de7a6ef..1fd1ad52 100644
--- a/trunk-recorder/systems/system_impl.h
+++ b/trunk-recorder/systems/system_impl.h
@@ -109,146 +109,145 @@ class System_impl : public System {
 
   std::map<unsigned long, std::map<unsigned long, std::time_t>> talkgroup_patches;
 
-  std::string get_short_name();
-  void set_short_name(std::string short_name);
-  std::string get_upload_script();
-  void set_upload_script(std::string script);
-  bool get_compress_wav();
-  void set_compress_wav(bool compress);
-  std::string get_api_key();
-  void set_api_key(std::string api_key);
-  std::string get_bcfy_api_key();
-  void set_bcfy_api_key(std::string bcfy_api_key);
-  int get_bcfy_system_id();
-  void set_bcfy_system_id(int bcfy_system_id);
-  double get_min_duration();
-  void set_min_duration(double duration);
-  double get_max_duration();
-  void set_max_duration(double duration);
-  double get_min_tx_duration();
-  void set_min_tx_duration(double duration);
-  bool get_audio_archive();
-  void set_audio_archive(bool);
-  bool get_transmission_archive();
-  void set_transmission_archive(bool);
-  bool get_record_unknown();
-  void set_record_unknown(bool);
-  bool get_call_log();
-  void set_call_log(bool);
-  bool get_conversation_mode();
-  void set_conversation_mode(bool mode);
-  void set_mdc_enabled(bool b);
-  void set_fsync_enabled(bool b);
-  void set_star_enabled(bool b);
-  void set_tps_enabled(bool b);
+  std::string get_short_name() override;
+  void set_short_name(std::string short_name) override;
+  std::string get_upload_script() override;
+  void set_upload_script(std::string script) override;
+  bool get_compress_wav() override;
+  void set_compress_wav(bool compress) override;
+  std::string get_api_key() override;
+  void set_api_key(std::string api_key) override;
+  std::string get_bcfy_api_key() override;
+  void set_bcfy_api_key(std::string bcfy_api_key) override;
+  int get_bcfy_system_id() override;
+  void set_bcfy_system_id(int bcfy_system_id) override;
+  double get_min_duration() override;
+  void set_min_duration(double duration) override;
+  double get_max_duration() override;
+  void set_max_duration(double duration) override;
+  double get_min_tx_duration() override;
+  void set_min_tx_duration(double duration) override;
+  bool get_audio_archive() override;
+  void set_audio_archive(bool) override;
+  bool get_transmission_archive() override;
+  void set_transmission_archive(bool) override;
+  bool get_record_unknown() override;
+  void set_record_unknown(bool) override;
+  bool get_call_log() override;
+  void set_call_log(bool) override;
+  bool get_conversation_mode() override;
+  void set_conversation_mode(bool mode) override;
+  void set_mdc_enabled(bool b) override;
+  void set_fsync_enabled(bool b) override;
+  void set_star_enabled(bool b) override;
+  void set_tps_enabled(bool b) override;
 
-  bool get_mdc_enabled();
-  bool get_fsync_enabled();
-  bool get_star_enabled();
-  bool get_tps_enabled();
+  bool get_mdc_enabled() override;
+  bool get_fsync_enabled() override;
+  bool get_star_enabled() override;
+  bool get_tps_enabled() override;
 
-  void set_analog_levels(double r);
-  double get_analog_levels();
-  void set_digital_levels(double r);
-  double get_digital_levels();
-  void set_qpsk_mod(bool m);
-  bool get_qpsk_mod();
-  void set_squelch_db(double s);
-  double get_squelch_db();
+  void set_analog_levels(double r) override;
+  double get_analog_levels() override;
+  void set_digital_levels(double r) override;
+  double get_digital_levels() override;
+  void set_qpsk_mod(bool m) override;
+  bool get_qpsk_mod() override;
+  void set_squelch_db(double s) override;
+  double get_squelch_db() override;
   void set_tau(float tau) override;
   float get_tau() const override;
-  void set_max_dev(int max_dev);
-  int get_max_dev();
-  void set_filter_width(double f);
-  double get_filter_width();
-  gr::msg_queue::sptr get_msg_queue();
-  std::string get_system_type();
-  unsigned long get_sys_id();
-  unsigned long get_wacn();
-  unsigned long get_nac();
-  int get_sys_rfss();
-  int get_sys_site_id();
-  void set_xor_mask(unsigned long sys_id, unsigned long wacn, unsigned long nac);
-  const char *get_xor_mask();
-  bool update_status(TrunkMessage message);
-  bool update_sysid(TrunkMessage message);
-  int get_sys_num();
-  void set_system_type(std::string);
-  std::string get_talkgroups_file();
-  std::string get_unit_tags_file();
-  Source *get_source();
-  void set_source(Source *);
-  Talkgroup *find_talkgroup(long tg);
-  Talkgroup *find_talkgroup_by_freq(double freq);
-  std::string find_unit_tag(long unitID);
-  void set_talkgroups_file(std::string);
-  void set_channel_file(std::string channel_file);
-  bool has_channel_file();
-  void set_unit_tags_file(std::string);
-  void set_custom_freq_table_file(std::string custom_freq_table_file);
-  std::string get_custom_freq_table_file();
-  bool has_custom_freq_table_file();
-  int control_channel_count();
-  int get_message_count();
-  void set_message_count(int count);
-  int get_decode_rate();
-  void set_decode_rate(int rate);
-  void add_control_channel(double channel);
-  double get_next_control_channel();
-  double get_current_control_channel();
-  int channel_count();
-  void add_channel(double channel);
-  void add_conventional_recorder(analog_recorder_sptr rec);
-  void add_conventionalP25_recorder(p25_recorder_sptr rec);
-  void add_conventionalSIGMF_recorder(sigmf_recorder_sptr rec);
-  void add_conventionalDMR_recorder(dmr_recorder_sptr rec);
-  std::vector<p25_recorder_sptr> get_conventionalP25_recorders();
-  std::vector<analog_recorder_sptr> get_conventional_recorders();
-  std::vector<sigmf_recorder_sptr> get_conventionalSIGMF_recorders();
-  std::vector<dmr_recorder_sptr> get_conventionalDMR_recorders();
-  std::vector<double> get_channels();
-  std::vector<double> get_control_channels();
-  std::vector<Talkgroup *> get_talkgroups();
+  void set_max_dev(int max_dev) override;
+  int get_max_dev() override;
+  void set_filter_width(double f) override;
+  double get_filter_width() override;
+  gr::msg_queue::sptr get_msg_queue() override;
+  std::string get_system_type() override;
+  unsigned long get_sys_id() override;
+  unsigned long get_wacn() override;
+  unsigned long get_nac() override;
+  int get_sys_rfss() override;
+  int get_sys_site_id() override;
+  void set_xor_mask(unsigned long sys_id, unsigned long wacn, unsigned long nac) override;
+  const char *get_xor_mask() override;
+  bool update_status(TrunkMessage message) override;
+  bool update_sysid(TrunkMessage message) override;
+  int get_sys_num() override;
+  void set_system_type(std::string) override;
+  std::string get_talkgroups_file() override;
+  std::string get_unit_tags_file() override;
+  Source *get_source() override;
+  void set_source(Source *) override;
+  Talkgroup *find_talkgroup(long tg) override;
+  Talkgroup *find_talkgroup_by_freq(double freq) override;
+  std::string find_unit_tag(long unitID) override;
+  void set_talkgroups_file(std::string) override;
+  void set_channel_file(std::string channel_file) override;
+  bool has_channel_file() override;
+  void set_unit_tags_file(std::string) override;
+  void set_custom_freq_table_file(std::string custom_freq_table_file) override;
+  std::string get_custom_freq_table_file() override;
+  bool has_custom_freq_table_file() override;
+  int control_channel_count() override;
+  int get_message_count() override;
+  void set_message_count(int count) override;
+  int get_decode_rate() override;
+  void set_decode_rate(int rate) override;
+  void add_control_channel(double channel) override;
+  double get_next_control_channel() override;
+  double get_current_control_channel() override;
+  int channel_count() override;
+  void add_channel(double channel) override;
+  void add_conventional_recorder(analog_recorder_sptr rec) override;
+  void add_conventionalP25_recorder(p25_recorder_sptr rec) override;
+  void add_conventionalSIGMF_recorder(sigmf_recorder_sptr rec) override;
+  void add_conventionalDMR_recorder(dmr_recorder_sptr rec) override;
+  std::vector<p25_recorder_sptr> get_conventionalP25_recorders() override;
+  std::vector<analog_recorder_sptr> get_conventional_recorders() override;
+  std::vector<sigmf_recorder_sptr> get_conventionalSIGMF_recorders() override;
+  std::vector<dmr_recorder_sptr> get_conventionalDMR_recorders() override;
+  std::vector<double> get_channels() override;
+  std::vector<double> get_control_channels() override;
+  std::vector<Talkgroup *> get_talkgroups() override;
   gr::msg_queue::sptr msg_queue;
   System_impl(int sys_id);
-  void set_bandplan(std::string);
-  std::string get_bandplan();
-  void set_bandfreq(int);
-  int get_bandfreq();
-  void set_bandplan_base(double);
-  double get_bandplan_base();
-  void set_bandplan_high(double high);
-  double get_bandplan_high();
-  void set_bandplan_spacing(double);
-  double get_bandplan_spacing();
-  void set_bandplan_offset(int);
-  int get_bandplan_offset();
-  void set_talkgroup_display_format(TalkgroupDisplayFormat format);
-  TalkgroupDisplayFormat get_talkgroup_display_format();
+  void set_bandplan(std::string) override;
+  std::string get_bandplan() override;
+  void set_bandfreq(int) override;
+  int get_bandfreq() override;
+  void set_bandplan_base(double) override;
+  double get_bandplan_base() override;
+  void set_bandplan_high(double high) override;
+  double get_bandplan_high() override;
+  void set_bandplan_spacing(double) override;
+  double get_bandplan_spacing() override;
+  void set_bandplan_offset(int) override;
+  int get_bandplan_offset() override;
+  void set_talkgroup_display_format(TalkgroupDisplayFormat format) override;
+  TalkgroupDisplayFormat get_talkgroup_display_format() override;
 
-  bool get_hideEncrypted();
-  void set_hideEncrypted(bool hideEncrypted);
+  bool get_hideEncrypted() override;
+  void set_hideEncrypted(bool hideEncrypted) override;
 
-  bool get_hideUnknown();
-  void set_hideUnknown(bool hideUnknown);
+  bool get_hideUnknown() override;
+  void set_hideUnknown(bool hideUnknown) override;
 
-  boost::property_tree::ptree get_stats();
-  boost::property_tree::ptree get_stats_current(float timeDiff);
+  boost::property_tree::ptree get_stats() override;
+  boost::property_tree::ptree get_stats_current(float timeDiff) override;
 
-  std::vector<unsigned long> get_talkgroup_patch(unsigned long talkgroup);
-  void update_active_talkgroup_patches(PatchData f_data);
-  void delete_talkgroup_patch(PatchData f_data);
-  void clear_stale_talkgroup_patches();
-  void print_active_talkgroup_patches();
+  std::vector<unsigned long> get_talkgroup_patch(unsigned long talkgroup) override;
+  void update_active_talkgroup_patches(PatchData f_data) override;
+  void delete_talkgroup_patch(PatchData f_data) override;
+  void clear_stale_talkgroup_patches() override;
+  void print_active_talkgroup_patches() override;
+  bool get_multiSite() override;
+  void set_multiSite(bool multiSite) override;
 
-  bool get_multiSite();
-  void set_multiSite(bool multiSite);
+  std::string get_multiSiteSystemName() override;
+  void set_multiSiteSystemName(std::string multiSiteSystemName) override;
 
-  std::string get_multiSiteSystemName();
-  void set_multiSiteSystemName(std::string multiSiteSystemName);
-
-  unsigned long get_multiSiteSystemNumber();
-  void set_multiSiteSystemNumber(unsigned long multiSiteSystemNumber);
+  unsigned long get_multiSiteSystemNumber() override;
+  void set_multiSiteSystemNumber(unsigned long multiSiteSystemNumber) override;
 
 private:
   TalkgroupDisplayFormat talkgroup_display_format;