Better errors and more index formats