Applied archSeer's patches