Some metrica + fixes