corrected some generic classes that were not declaring all the required generic parameters