Some gcw0 patches