Update specs to avoid unneeded conflicts