Closing assorted resolve bugs

The commits have all the details.