Fix: quality controls