Index fix and credits upstream pull