Fixed g-c-c patches