Merge upstream fixes (missing commas)