Fixes for overriding.
Better support inner generic types.