[COMMIT] Miscompiled macro fixes