Fixes in regards to array index removal