3 files changed, 4 insertions, 4 deletions
diff --git a/gnuradio-core/src/lib/general/gr_annotator_raw.cc b/gnuradio-core/src/lib/general/gr_annotator_raw.cc
index e1ae73efb..d3dcce73a 100644
--- a/gnuradio-core/src/lib/general/gr_annotator_raw.cc
+++ b/gnuradio-core/src/lib/general/gr_annotator_raw.cc
@@ -55,7 +55,7 @@ void gr_annotator_raw::add_tag(uint64_t offset, pmt_t key, pmt_t val)
   gruel::scoped_lock l(d_mutex);
 
   gr_tag_t tag;
-  tag.srcid = pmt::pmt_intern(d_name);
+  tag.srcid = pmt::pmt_intern(name());
   tag.key = key;
   tag.value = val;
   tag.offset = offset;
diff --git a/gnuradio-core/src/lib/general/gr_endian_swap.cc b/gnuradio-core/src/lib/general/gr_endian_swap.cc
index d86da5aa7..8bea0ca30 100644
--- a/gnuradio-core/src/lib/general/gr_endian_swap.cc
+++ b/gnuradio-core/src/lib/general/gr_endian_swap.cc
@@ -51,7 +51,7 @@ gr_endian_swap::work (int noutput_items,
   const char *in = (const char *) input_items[0];
   char *out = (char *) output_items[0];
 
-  int nbytes( d_output_signature->sizeof_stream_item(0) );
+  int nbytes( output_signature()->sizeof_stream_item(0) );
   if(is_unaligned()) {
       switch(nbytes){
         case 1:
diff --git a/gnuradio-core/src/lib/general/gr_skiphead.cc b/gnuradio-core/src/lib/general/gr_skiphead.cc
index c887376e4..7b441bea9 100644
--- a/gnuradio-core/src/lib/general/gr_skiphead.cc
+++ b/gnuradio-core/src/lib/general/gr_skiphead.cc
@@ -43,14 +43,14 @@ gr_make_skiphead (size_t itemsize, uint64_t nitems_to_skip)
 
 int
 gr_skiphead::general_work(int noutput_items,
-			  gr_vector_int &ninput_items_ignored,
+			  gr_vector_int &ninput_items_,
 			  gr_vector_const_void_star &input_items,
 			  gr_vector_void_star &output_items)
 {
   const char *in = (const char *) input_items[0];
   char *out = (char *) output_items[0];
 
-  int ninput_items = noutput_items;	// we've got at least this many input items
+  int ninput_items = std::min(ninput_items_[0], noutput_items);
   int ii = 0;				// input index
 
   while (ii < ninput_items){