Make sure indices are added removed properly for migrations