index and cross-reference fixes