Fix some indices