Attempt to address more issues related to covariance§

Signed-off-by: Gary Pamparà <gpampara@gmail.com>