Minor word tree bug fixes