Fixed more indexing issues