Fixes to init and index files