Finish up Forestry update (yikes!)