Missing chnages from 3.10