Cleanups, set cq size properly