Sorry, I initially modified the code not from the latest version, which only sometime later I realized. So this must be some of them that I missed while comparing the changes.