Some spec fixes.