Some bug fixes

And prep for region filter on instances.