RC Spec fixes for 12-stable