more fixes for extraction