Index fixes

Some entries were missing indexes.