Minor fixes for some rare bugs with Index Controllers.