More Generic Type fixes