Fix forest platform issues

Fixes #1495.