Updates for Forestry 2.0

Reflects changes up to the latest beta.