changes to make everything work with latest sunspot