Revert "Revert "MocCQ fixes""

This reverts commit 6e7b529f90746dd3dd8867bc562a27b079d3d2ec.