Multiple fixes for the index abstraction