Resolution logic fixes