Bug fixes for dropping index when indexed column dropped