More forest improvements