Fix the build + new spec for index update