Add missing jandex indexes back