Fixes some index methods