Misc Bugfixes

@Subjunk: several new fixes having to do with recent changes + older resolver fixes from prior (closed) pull request.