From atom to modern: Yield bug fixes

Yield bug fixes