Fix list and index notations