more generics fixes
generics checkpoint
generics checkpoint
partial fix for generic properties