Some fixes about quality