Added a couple more things that missed the indexing issue