adjust to changes in 3.7M2
3 files changed