Further attempts at getting a sterile tree on 5.8
Further improve the sterile list
Use more safe code