Index and Portfolio minor edits