Some Index fixes