Fixes to specs for spec update.