It seems something went wrong when I sent the last message, so I'll try
sending the patches again: