Macros fixes related to the removal of Gc