Regex fix for Warpbook and Gravestone, GC tree change to 1.7