Merge "fix two generator examples"