More Forest protocol fixing