Three spec fixes