yet more spec fixes