more autoresolve changes