Sodpiii leapyear and indexing bug fix