Changes to make forest running consistent with changes to forest class