Make the indexing service work with new framework

There are several misc fixes that are a part of this release as well.