Again fixing warnings due to "index" vs "size_t"