Added autoresolving of compatibility problems