Final batch of generics changes