Few GCM changes