Finish up RCS fixes to generics pods