diff --git a/src/algorithms/signal_source/adapters/file_source_base.cc b/src/algorithms/signal_source/adapters/file_source_base.cc
index f949b7b4e..f2d50abb0 100644
--- a/src/algorithms/signal_source/adapters/file_source_base.cc
+++ b/src/algorithms/signal_source/adapters/file_source_base.cc
@@ -295,6 +295,7 @@ gr::basic_block_sptr FileSourceBase::get_right_block()
     // clang-tidy wants braces around the if-conditions. clang-format wants to break the braces into
     // multiple line blocks. It's much more readable this way
     // clang-format off
+    if (extra_data_source_) { return extra_data_source_; }
     if (valve_) { return valve_; }
     if (throttle_) { return throttle_; }
     return source();
diff --git a/src/algorithms/signal_source/gnuradio_blocks/extra_data_source.cc b/src/algorithms/signal_source/gnuradio_blocks/extra_data_source.cc
index ec75b0111..202dcb49e 100644
--- a/src/algorithms/signal_source/gnuradio_blocks/extra_data_source.cc
+++ b/src/algorithms/signal_source/gnuradio_blocks/extra_data_source.cc
@@ -61,7 +61,7 @@ std::size_t ExtraDataSource::get_sample_period() const
 
 int ExtraDataSource::work(int noutput_items,
     gr_vector_const_void_star& input_items,
-    gr_vector_void_star& output_items) override
+    gr_vector_void_star& output_items)
 {
     const std::size_t ch = 0;
     const int item_size = input_signature()->sizeof_stream_item(ch);
diff --git a/src/algorithms/signal_source/libs/extra_data_file.cc b/src/algorithms/signal_source/libs/extra_data_file.cc
index 9428908c6..274c7b13b 100644
--- a/src/algorithms/signal_source/libs/extra_data_file.cc
+++ b/src/algorithms/signal_source/libs/extra_data_file.cc
@@ -65,7 +65,7 @@ std::vector<uint8_t> ExtraDataFile::read_item()
 
 void ExtraDataFile::read_into_io_buffer()
 {
-    file_.get(reinterpret_cast<char*>(io_buffer_.data()), io_buffer_size_);
+    file_.read(reinterpret_cast<char*>(&io_buffer_[0]), io_buffer_size_);
     const std::size_t bytes_read = file_.gcount();
 
     if (bytes_read < io_buffer_size_)
@@ -73,7 +73,7 @@ void ExtraDataFile::read_into_io_buffer()
             if (repeat_)
                 {
                     reset();
-                    file_.get(reinterpret_cast<char*>(&io_buffer_[bytes_read]), io_buffer_size_ - bytes_read);
+                    file_.read(reinterpret_cast<char*>(&io_buffer_[bytes_read]), io_buffer_size_ - bytes_read);
                 }
             else
                 {