Added some missing yields