Corrected some generic types