fix some specs broken by recent commits
finish fixing existing manufactured specs