last chance resolver + fixes