Update cy

This has the two patches from @ryangreaves