FIX: Fix cov and utils