more spec fixes