A few fixes needed as a result of imported 3.10 changes