Fixes for extraction macro