Fix macros uses (q became Q)