Updated for some MCP changes while I was gone
Probably more changes from Forge, etc., but I'll look for them later.