Fixes on index