Avoid use of covariant return type change fns fixing backwards compat