Fixes for extending strategies and include-term handling