More spec fixes.