Additional spec fixes

There might be more lurking that I haven't yet discovered.
For details and examples, please see the commit messages.