Fixed collection parse issues.