Fix some avatar issues and index registration