More spec fixes