fix gwcm issues