Regenerate spec after zcorpan's PRs