Fixes to my impl of forester