Fix for generic type syntax changes