Changes to work with new resolve strategies.