fix a few cq issues