Some minor edits to make the spec work correctly.