Fix some issues with blocks and yields