fixes for index doc &c